uppg 2
Merge branch 'master' of https://github.com/smallgreycreatures/prop-clj
Uppg 2 done