update admin
Merge pull request #13 from shawannewang/master

starting mobile
tooltips started
Merge branch 'master' of https://github.com/mclawges22/school-discipline
merge resolution
Json's done!
add graduation rates to API
add graduation rates to API
add sat scores api
add discipline api
add expenses api
add composite field for discipline model
update discipline math
add discipline demographics
why isn't the API working
Merge pull request #15 from mclawges22/master

why isn't the API working
push api to heroku
merge
prep for heroku
prep for heroku