...
...
Merge branch 'master' of https://github.com/arnabold/mashing

Conflicts:
	clojure/spikes/test/spikes/scalars_test.clj