Merge pull request #38 from wykhuh/feat/like

(Feat/like) (Feat/search) Fix like and search.
index buttons use funcs
Merge branch 'master' of https://github.com/GoldenLions/Artproject into useFuncs
ng-show on nav links
Merge branch 'master' of https://github.com/GoldenLions/Artproject into front-end

Conflicts:
	client/www/scripts/controllers/mainController.js
Merge pull request #39 from myclamm/useFuncs

nav buttons use ng-click now
Merge branch 'master' of https://github.com/GoldenLions/Artproject into front-end

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

(feature) ng-show on nav links
(feat/search) Add quoted search. Fix regex