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
little things
Merge branch 'master' into helen
working on tiny box, and added david's app.py stuff
Merge pull request #59 from stuycs-ml7-projects/master

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

Oliver
Merge pull request #60 from stuycs-ml7-projects/helen

Helen
app.py
Added back the button in the account page. The update page got deleted so helen should add that back
Merge pull request #61 from stuycs-ml7-projects/dkurk

Added back the button in the account page. The update page got deleted s...
added update back to app.py
small changes in app.py
Merge branch 'master' into helen
made appropriate backfround changes do that maps.html has the right background!
small changes in app.py
Merge pull request #62 from stuycs-ml7-projects/shreya

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

Helen
some app.py housekeeping
blah