changes
Merge branch 'master' of https://github.com/eric-zhu5121/vimrc

Conflicts:
	vimrc