did things
Merge branch 'master' of https://github.com/stuycs-softdev/ScavengerTours

Conflicts:
	app.py
	db.py
	templates/city.html