Try kramdown on github
Merge branch 'master' of github.com:joakin/joakin.github.com

Conflicts:
	_config.yml