pre merge
Merge branch 'master' of github.com:snt/s99-clj
P21