commit_1
Merge branch 'master' of https://github.com/zhangdaiwei/MacLabVim

Conflicts:
	.vimrc