added markdown and added align
Merge branch 'bran-new-vim' of https://github.com/kazuph/dotfiles into bran-new-vim

Conflicts:
	_vimrc