cleaning up code
Merge branch 'master' of https://github.com/GoldenLions/GoldenLions into clean-up

Conflicts:
	client/search/search.js
	client/services/services.js
Merge pull request #100 from kwalker3690/clean-up

(fix) Clean up user and services