School commit
Merge pull request #1 from jonasbroesterhaus/school

Merge school with master branch