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

Conflicts:
	app.py