Added recommendation view
Added recommendation view
Added Recommendation Page
Modified File
fixing merge conflict
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	.DS_Store
	client/.DS_Store
	client/www/.DS_Store
	client/www/index.html
	client/www/scripts/app.js
Merge pull request #17 from Chunhao137/artsafari

(feat/recommendation) Added recommendation page and fixed scrolling