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

Conflicts:
	templates/homepage.html
	templates/index.html