spacing icons on navbar
profile page done for now
fixed update method in user model saving weight on new user
food and exercise all() methods working
fixed merge conflict
fetching pull request with conflicts
hooked up food across modules
conflicts resolved
fixed conflicts
Merge branch 'master' into brian
finished for class
Merge pull request #19 from bchiatt/brian

spacing icons on navbar
Merge branch 'master' of https://github.com/bchiatt/i-fit into matt
Merge pull request #20 from bchiatt/matt

updated dashboard exercise form
Merge pull request #21 from bchiatt/brian

profile page done for now
Merge pull request #22 from bchiatt/brian

Brian
Merge pull request #23 from bchiatt/food-chain

hooked up food across modules
Merge pull request #24 from bchiatt/brian

Brian
Merge pull request #25 from bchiatt/brian

finished for class
Merge branch 'master' of https://github.com/bchiatt/i-fit into matt