Merge branch 'blockcontainer' of github.com:melinath/philo into blockcontainer