merging
Merge branch 'development' of https://github.com/peterm95018/dining-app into development

Conflicts:
	app/whats_open.html