Integrated Order a meal with Browse a meal
Merge remote-tracking branch 'origin/master'

Conflicts:
	CookForMe/app/views/main.html