pull down master
Merge branch 'master' into brian
user and goals forms updating now
merge conflict resolved
weight bar shows
fixed goals on profile
fixing merge conflicts
fixed conflicts on profile.jade
bmiCalculate method added to client side
Merge pull request #9 from bchiatt/matt

profile form
food, exercise models
Merge pull request #10 from bchiatt/models

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

food and ex added
Merge pull request #12 from bchiatt/brian

Brian
Merge pull request #14 from bchiatt/brian

Brian
Merge pull request #15 from bchiatt/brian

bmiCalculate method added to client side
Merge pull request #16 from bchiatt/matt

Matt
trying to merge with master.  ***Might break****