trials added
Merge branch 'master' of https://github.com/virolsan/clojure.git

Conflicts:
	clojure-testing/src/training/_4clojure/core.clj