Merge branch 'master' into sofia
yes
working on layout; done with most pages besides city
added ongoing tours to homepage
added a create page, fixed spacing in homepage
worked on design of city page
added current tour features
Merge branch 'master' of https://github.com/stuycs-softdev/ScavengerTours
quick fix to getUser() - wasn't updating properly
currenttour updating works from site
changed some hompage things from school computer
fixed add to mobile function
added image display for tours
started on create and put in points
drop stuff
Merge pull request #3 from stuycs-softdev/denis

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

Conflicts:
	app.py
	db.py
	templates/city.html
fixed first error
hi