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

update dkurk w master
Merge branch 'master' into dkurk
Lots more work on the translation of master. Added in editProfile().
Lots more work on the translation of master. Added in editProfile().
Merge branch 'master' into oliver
Merge branch 'master' into oliver
Added deleteUser()
Merge pull request #37 from stuycs-ml7-projects/oliver

Oliver
testing stuff
Merge branch 'master' into helen
tested new middleman methods
tested middleman methods in app.py
Added the tinybox.js which really needs to be fiddled with. Changed maps.html to include it as a src. And I also changed maps.js because I wanted to bind one svg, just the very top one (floor 10) for the time being, to a pop up. All it does is pop up a screen with a bordered svg...I had to manually type in the html code so we should figure out how to type in a file. Maybe there is a good tutorial for this thing somewhere.
Merge pull request #38 from stuycs-ml7-projects/helen

Tested new middleman methods in app.py
Merge branch 'master' into dkurk
periods working
Merge pull request #39 from stuycs-ml7-projects/dkurk

Added tinybox still needs to really be implemented
Merge branch 'master' into helen
Merge pull request #40 from stuycs-ml7-projects/helen

periods working
add route for deleteUser