merge conflict resolved
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
styling
sites/index and sites/show work
Merge pull request #63 from maiahariton/master

sites/index and sites/show work
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
add styling
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
Merge pull request #64 from indotek68/master

added styling to show
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
404 page
Merge pull request #65 from maiahariton/master

404 page
added cal goals
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget
rest