change to user model
Merge branch 'master' of https://github.com/dcavoulacos/Lunchtyme