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

Conflicts:
	app.py
got it to work
fdsa