equalities - conditionals
Merge branch 'master' of github.com:theophoric/clojure-koans

Conflicts:
	src/koans/01_equalities.clj
	src/koans/02_lists.clj
	src/koans/03_vectors.clj
	src/koans/04_sets.clj
	src/koans/05_maps.clj
	src/koans/06_functions.clj
	src/koans/07_conditionals.clj