Updated functionality
Merge branch 'master' of https://github.com/jhirniak/pizza-for-students