markdown-mode
Merge branch 'master' of github.com:tanakh/.emacs.d

Conflicts:
	.gitignore