markdown stuff
Merge branch 'master' of https://github.com/pcompassion/.emacs.d

Conflicts:
	init.el