food, exercise models
food and ex added
Merge pull request #10 from bchiatt/models

food, exercise models
Merge pull request #11 from bchiatt/dev

food and ex added
fixing merge conflicts