search fires on keyup
MICHAEL FIX THESE CONFLICTS

Conflicts:
	app/static/css/source/app.css