stuffs
this is really weird
Merge branch 'master' of http://github.com/epait/school-discipline
I just want to merge
fix pie, fix bar labels...hopefully for the last time..gotta love coding blind
Merge pull request #33 from mclawges22/master

some tweaks