Merge branch 'julian' of git://github.com/lapilofu/philo