deleted stupid dumb ugly stinking stupid-
Merge branch 'master' of https://github.com/jensenr30/School