merge conflict fixed
added link to food show
Merge pull request #32 from maiahariton/master

added sites controller and put the splash page on sites/index
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
Merge pull request #33 from indotek68/master

Added links to recipes
Merge branch 'master' of git://github.com/ncaskey04/BodyBudget
Merge pull request #34 from maiahariton/master

sites controller
Merge branch 'master' of git://github.com/ncaskey04/BodyBudget