message
Merge branch 'master' of https://github.com/jogloran/govhack

Conflicts:
	app.py
Merge branch 'master' of https://github.com/jogloran/govhack
added changes to app.py to have better searches