did some testing with merging and added bootstrap to vendors/assets
Merge pull request #15 from indotek68/master

did some testing with merging and added bootstrap to vendors/assets
added header
Merge pull request #16 from indotek68/master

added header and data for yummly search
pie chart works
added articles routes
Merge pull request #17 from indotek68/master

pie chart works
refactoring oauth
fixing merge conflicts with routes
integrated oauth and login steps
Merge pull request #18 from ncaskey04/dev

integrated oauth and login steps
oauth complete
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
can get JSON data back from fitbit
Merge pull request #21 from ncaskey04/dev

can get JSON data back from fitbit