updated home view
user model updates
Merge branch 'master' into brian
saving changes before pulling origin
Merge branch 'master' into brian
Merge branch 'master' into brian
user info received from db to profile view
Merge pull request #1 from bchiatt/matt

Matt
initial data
Merge pull request #2 from bchiatt/models

initial data
Merge pull request #3 from bchiatt/matt

add food
empty function defs
Merge pull request #4 from bchiatt/models

empty function defs
Merge pull request #5 from bchiatt/matt

user form
Merge pull request #6 from bchiatt/matt

form stuff
Merge pull request #7 from bchiatt/brian

Brian
Merge pull request #8 from bchiatt/matt

blah