working with oauth
fixing merge conflicts
oauth is working, but with password issues
fixing merge conflicts
fixing merge conflicts
oauth works
Merge pull request #12 from ncaskey04/dev

oauth works
playing around with charts
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
login and logout methods created in sessions controller, simple view for sessions new created
able to search Yummly API
Merge pull request #13 from ncaskey04/dev

login and logout methods created in sessions controller, simple view for...
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
refactored yummly api
Merge pull request #14 from indotek68/master

playing around with charts
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
changes