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

Conflicts:
	_vimrc