Second edit
Merge branch 'master' of https://github.com/kalwyn/Classmaster3000