update and new stuff
Merge branch 'master' of github.com:magenroy/School