some stuff from a while ago
Merge branch 'master' of github.com:pat-thomas/sandbox

Conflicts:
	clj/.gitignore
	clj/LICENSE
	clj/README.md
	clj/doc/intro.md
	clj/project.clj
	clj/test/clj/core_test.clj
	clojure/async-stuff/test/async_stuff/core_test.clj
	clojure/clj-sandbox/.gitignore
	clojure/clj-sandbox/LICENSE
	clojure/clj-sandbox/README.md
	clojure/clj-sandbox/doc/intro.md
	clojure/clj-sandbox/project.clj
	clojure/clj-sandbox/test/clj_sandbox/core_test.clj
	clojure/clj-scratch/.gitignore
	clojure/clj-scratch/LICENSE
	clojure/clj-scratch/README.md