Merge branch 'gh-pages' of git://github.com/lapilofu/philo into gh-pages