Changed url location for pull down in index.html
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari
No changes
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	client/www/index.html
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	client/www/index.html
	client/www/scripts/controllers/mainController.js
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	client/www/index.html
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari
Renamed index.js to server.js
Merge pull request #35 from Chunhao137/artsafari

(feat) Changed index.js to server.js for deployment on azure
search working
Merge branch 'master' of https://github.com/GoldenLions/Artproject into front-end

Conflicts:
	client/www/scripts/controllers/mainController.js
Merge pull request #36 from kwalker3690/front-end

(fix) search working
fixed login bugs
fixed merge
Merge pull request #37 from myclamm/mainCtrlLogin

logout button added
(feat/recommend) Fix reccomend and likes.
(feat/recommend) Fix reccomend and likes.
(feat/search) fix search regex
Merge branch 'feat/like' of https://github.com/wykhuh/Artproject into feat/like