Merge branch 'master' of git://github.com/ncaskey04/BodyBudget
Merge branch 'master' of git://github.com/ncaskey04/BodyBudget
Merge pull request #36 from maiahariton/master

updates