Merge branch 'master' into helen
preparing for testing
Merge pull request #20 from stuycs-ml7-projects/oliver

Oliver
Merge branch 'master' into helen
app.py and working
app.py working
Merge pull request #21 from stuycs-ml7-projects/helen

Helen
Moved things around in the static folder so that all the links were right and the template would load, but the first ajax request is still not working right. Helen should look into it.
Adding the css and js folders to static
Merge pull request #22 from stuycs-ml7-projects/master

Moving master into dkurk
Added method loadMapsByGrade which will use server method getPeopleByGrade which takes a number 9 10 11 12 or 0 for teachers and only gives back that subset. I will color code later.
Merge pull request #23 from stuycs-ml7-projects/dkurk

Adding the loadMapByGrade method and fixing up the static folder
Merge branch 'master' into oliver