Got all filters on search page working
Merge branch 'master' of github.com:vaughanj10/new_synergy

Conflicts:
	config/routes.rb