...
Merge branch 'master' of https://github.com/jiazhoulvke/myvim

Conflicts:
	_vimrc
...