Merge pull request #62 from maiahariton/master

sites/index and sites/show work perfectly with links
merge conflict resolved
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
styling
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 pull request #64 from indotek68/master

added styling to show
404 page