Merge branch '404_relationship_bugfix' of git://github.com/melinath/philo