fix
Merge branch 'master' of github.com:CandySunPlus/dot_vim

Conflicts:
	vimrc