feedback
Merge branch 'master' of https://github.com/ewhitmire/Connector

Conflicts:
	wsgi/static/css/style.css
fixed search