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