resolved a conflict manually
not sure what changed
Merge branch 'master' of https://github.com/elenam/intro-clojure-materials