Revert "split bars and foods"

This reverts commit c98d235536de244021dbb2f90ef156fc9f1a1067.
merged bars and take-aways again (simpler)
Merge branch 'mergin_stuff_again' into gh-pages

Conflicts:
	index.html