merging changes
Merge branch 'master' of https://github.com/nklotz/CookingWithFriends
mergez
GUI version 2