Merge branch 'gh-pages'
rm food
fixed page-6
Merge branch 'master' into gh-pages