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

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

Oliver
tiny box
tiny box
Merge branch 'master' into helen
edited app.py, added a faded background image for maps.html, and added twilioAcc.py (which contains the twilio account info)
added twilio files
added twilio files
Merge pull request #67 from stuycs-ml7-projects/shreya

I added the twilio stuff
tiny box
tiny box
Merge branch 'master' into helen
edited app.py to include twilio functions
tiny Box
made changes to toString for display
made some formatting changes to maps.html - used a lighter, clearer background

I also added a missing semicolon to style.css
changed toString again
added a background jpg
added the "two column" profile view, and smaller font for the profile

#schedule - left column
#restOfProfile - right column
tiny box - almost done