Typos
Merge branch 'solution'

Conflicts:
	test/clojure_workshop/ex_1.clj