Merge pull request #65 from maiahariton/master

404 page
added cal goals
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
added styling
added calGoal
Merge pull request #66 from indotek68/master

add calGoal
preparing for deploy
heroku deployment
working on heroku deployment
heroku deployment
working with heroku deployment
precompile assets
production stuff;
oauth complete, dynamic login authorization works
user authentication is back up
more chages to show
Merge pull request #67 from indotek68/master

more chages to show
precompiling again
logout button in navbar