search bar
Merge branch 'master' of https://github.com/dhudaddy/prism

Conflicts:
	logs/access.log
	logs/error.log
	uwsgi.log