First commit,Add plugins and vimrc
Fix merge conflict