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

Conflicts:
	templates/touroverview.html
Merge branch 'master' of github.com:stuycs-softdev/ScavengerTours

Conflicts:
	templates/touroverview.html