bumped up markdown-clj version
Merge branch 'master' of https://github.com/lacarmen/cryogen-core

Conflicts:
	project.clj