Merge pull request #22 from Chunhao137/artsafari

(feat/tinderizing) Added tinkering features to app with fake data
styling and reconfiguring files
more styling
Merge pull request #23 from kwalker3690/front-end

(feature) styling and some file reconfiguration
enabled pagination for search results
removing unused bower files
adding in angular bootstrap
Merge pull request #24 from kwalker3690/front-end

(feature) Enabling pagination for search results
(feat/Recommendations) add Like function
(feat/Recommendations) Like function connects to database.
Merge pull request #25 from wykhuh/feat/like

(Feat/like) Like function is connected to database.
Added more functionality to recommendation
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	client/www/scripts/controllers/artRecommend.js
	client/www/styles/main.css
	client/www/views/recommendation.html