(fix) can search for username from any page
attempting to reset the services file
Merge branch 'master' of https://github.com/GoldenLions/GoldenLions into routing

Conflicts:
	client/search/search.js
	client/services/services.js
rolling forward services changes
Merge pull request #44 from kwalker3690/routing-fix

(fix) rolling forward services changes