updated database
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
Merge branch 'master' of https://github.com/stuycs-softdev/ScavengerTours

Conflicts:
	templates/homepage.html
	templates/index.html
database stuff done
Merge branch 'master' of github.com:stuycs-softdev/ScavengerTours
fixed tour overview page to show description
commented the expected changes to the city page
modified the map