修改wiki
Merge branch 'master' of github.com:baiyunping333/newvim

解决冲突