changed namespace
Merge branch 'master' into 0.1.0

Conflicts:
	project.clj