Add the indent guides
Merge branch 'master' of github.com:fangdx/myvimrc

Conflicts:
	vimrc

	modified:   README.md
	modified:   vimrc