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