Merge branch 'master' of github.com:MrPhantomT/multicode

* 'master' of github.com:MrPhantomT/multicode:
  fix

Conflicts:
	test/multicode/core_test.clj
Merge branch 'master' of github.com:MrPhantomT/multicode

* 'master' of github.com:MrPhantomT/multicode: