Feedback Added
a
Merge branch 'master' into local_v2

Conflicts:
	app/views/dishes/index.html.erb