Added restaurant trends
Merge branch 'master' into kenDev

Conflicts:
	public/javascripts/angularApp.js
	views/index.ejs
Fixed weird whitespace issue
Merge branch 'master' into inanDev

Conflicts:
	views/index.ejs