a littel change
Merge branch 'master' of https://github.com/xieqi/vimrc

Conflicts:
	.vimrc
change section
Merge branch 'master' of https://github.com/xieqi/vimrc

Conflicts:
	.vimrc