lots more work on styling
helping with fb login
working on ng-show
Merge pull request #32 from kwalker3690/front-end

(feature) lots more work on styling
replacing search bar in header
Merge pull request #33 from kwalker3690/front-end

(fix) replacing search bar in header
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