This is the local changes
Merge branch 'master' of http://github.com/Rothyu/Vimrc_configs
试试看那种效果比较好

Conflicts:
	README.md