Menu of selected foods
conflict fixed
Remove button
Added restaurant trends
Merge branch 'master' into kenDev

Conflicts:
	public/javascripts/angularApp.js
	views/index.ejs