added test cases
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dojo/core.clj
added missing fn
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dojo/core.clj
merged