and finished!
Merge branch 'master' of https://github.com/alexfikl/classes