changes to show food items
Merge branch 'master' of https://github.com/manugoyal/launch-restaurant

Conflicts:
	client/js/script.js