(feat/recommend) Fix reccomend and likes.
Merge pull request #36 from kwalker3690/front-end

(fix) search working
fixed login bugs
fixed merge
Merge pull request #37 from myclamm/mainCtrlLogin

logout button added
(feat/recommend) Fix reccomend and likes.
(feat/recommend) Fix reccomend and likes.
(feat/search) fix search regex
Merge branch 'feat/like' of https://github.com/wykhuh/Artproject into feat/like
Merge pull request #38 from wykhuh/feat/like

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

Conflicts:
	client/www/scripts/controllers/mainController.js