changes  splash page and the about us page
Merge pull request #28 from maiahariton/master

changes  to the about us page
deleted the about route
Merge pull request #29 from maiahariton/master

deleted the about route
added the sites controller
Merge pull request #31 from maiahariton/master

added the sites controller
Merge pull request #30 from indotek68/master

Fixed scrolling issue with pie chart
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