Update markdown
Merge branch 'master' of ssh://github.com/seejohnrun/dotfiles

Conflicts:
	.vimrc