changes
changes
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
changes
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
food controller
food controller #2
Merge pull request #22 from Rakulon/master

Food controller added
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
splashpage and about us page
Merge pull request #23 from maiahariton/master

splash page and about us page
working with fitbit JSON
Merge pull request #24 from ncaskey04/dev

working with fitbit JSON
deleted the about folder, created it twice for some reason
Merge branch 'master' of git://github.com/ncaskey04/BodyBudget
Merge pull request #25 from maiahariton/master

added the about us folder
added routes to splash page and the about us page
Merge pull request #26 from maiahariton/master

added routes to splash page and the about us page
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
merge resolved