commented bug
Merge branch 'master' of git@github.com:ihh/schooz