fixed update method in user model saving weight on new user
food and exercise all() methods working
fixed merge conflict
Merge pull request #22 from bchiatt/brian

Brian
fixed conflicts