Merge pull request #28 from browles/feat/autocomplete

Feat/autocomplete
(feat/search) Fixed the regex for search.
(fix) fix typo in handler.js
Merge branch 'master' of https://github.com/GoldenLions/Artproject

Conflicts:
	client/www/scripts/controllers/mainController.js
	client/www/scripts/services/userServices.js
Merge branch 'master' of https://github.com/GoldenLions/Artproject

Conflicts:
	client/www/scripts/controllers/mainController.js
Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge pull request #40 from kwalker3690/front-end

(feature) ng-show on nav links
Merge branch 'master' of https://github.com/GoldenLions/Artproject

Conflicts:
	client/www/scripts/controllers/mainController.js
	client/www/views/search.html
Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge pull request #41 from wykhuh/feat/search

(Feat/search) Added quoted search. Fix regex.
Merge branch 'master' of https://github.com/GoldenLions/Artproject
ngModel autocomplete in sync
Merge pull request #42 from browles/master

ngmodel
styling for mobile
Merge branch 'master' of https://github.com/GoldenLions/Artproject into front-end
like page works now
Merge branch 'master' of https://github.com/GoldenLions/Artproject into artsafari
Merge pull request #43 from Chunhao137/artsafari

(feat/like page) Able to display the pics you like now
autocomplete fix
Merge branch 'master' of https://github.com/GoldenLions/Artproject