Shorter koans
Merge branch 'master' of https://github.com/txssc/marvin