goodbye cruel world i am done fts
Merge branch 'master' of https://github.com/VanessaY/QuerySearch

Conflicts:
	app.py
	templates/ask.html
	templates/home.html