git ignore .class
Merge branch 'master' of https://github.com/nklotz/CookingWithFriends
login stuff
Merge branch 'master' of https://github.com/nklotz/CookingWithFriends
creating new account
new accoutn request merge conflict