vim init
Merge branch 'master' of https://github.com/alanerzhao/Vim-setting

Conflicts:
	README.md