merge conflict fixed
added sites controller and put the splash page on sites/index
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
sites controller
Merge branch 'master' of git://github.com/ncaskey04/BodyBudget
dashboard chages
deleted test:
Merge pull request #34 from maiahariton/master

sites controller
Food check working
Food check working #2
Merge branch 'master' of git://github.com/ncaskey04/BodyBudget
Merge pull request #36 from maiahariton/master

updates
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev
Merge pull request #35 from Rakulon/master

Food recipes linking from User search finally
Merge pull request #37 from indotek68/master

Updates
Merge branch 'master' of https://github.com/ncaskey04/BodyBudget into dev