Merge pull request #36 from stuycs-ml7-projects/master

pulling from master
Merge pull request #48 from stuycs-ml7-projects/master

pulling master into my branch
Merge pull request #59 from stuycs-ml7-projects/master

pulling master into my branch
made appropriate backfround changes do that maps.html has the right background!
Merge pull request #62 from stuycs-ml7-projects/shreya

Shreya
Merge pull request #63 from stuycs-ml7-projects/helen

Helen
some app.py housekeeping