changes
changes
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
Merge pull request #18 from ncaskey04/dev

integrated oauth and login steps
Merge pull request #19 from ncaskey04/dev

oauth complete and we have lots of fun user info saved to our user table now :)
pie chart is interactive
Merge pull request #20 from indotek68/master

pie chart is interactive
changes
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
Merge pull request #21 from ncaskey04/dev

can get JSON data back from fitbit
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