modify user name and email
Merge https://github.com/Aaron-z/vim
删除冲突的文件
Conflicts:
	README.md