Reset
Merge branch 'master' of github.com:newphew92/School