Changed url location for pull down in index.html
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari
No changes
Merge pull request #32 from kwalker3690/front-end

(feature) lots more work on styling
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	client/www/index.html
Merge pull request #33 from kwalker3690/front-end

(fix) replacing search bar in header
login takes you to rec page now
Merge branch 'master' of https://github.com/GoldenLions/Artproject into mainCtrlLogin
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari

Conflicts:
	client/www/index.html
	client/www/scripts/controllers/mainController.js
Merge pull request #34 from myclamm/mainCtrlLogin

FB login now takes you to recommendation page, and button for going to likes page works now
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