deleting json
preparing to pull upstream
Merge branch 'master' of http://github.com/epait/school-discipline
because
losing my mind
losing my mind
Merge pull request #21 from mclawges22/master

losing my mind