new version commit
Merge branch 'master' of github.com:t0nyren/academy