added cljx
Merge branch 'master' of https://github.com/yogthos/markdown-clj

Conflicts:
	project.clj