.
..
..
Merge branch 'master' of https://github.com/4clojure-solver/4clojure

Conflicts:
	.gitignore
.