Merge branch 'master' into sofia
working on layout of user homepage
rearranged layout of index
updated database
working on google related things
fixed location of google.html
got part of the way through with figuring out authentication and mapping
working database
put in description for each page
Merge branch 'master' of https://github.com/stuycs-softdev/ScavengerTours
realigned container items + minor things
played around with google stuff
Merge branch 'master' of https://github.com/stuycs-softdev/ScavengerTours

Conflicts:
	app.py
removed a head from app.py
moved the database
user login system up
user sign in without google finished
sign out system works
cities list in db.py works
jfoiwefhweifl