my vim
2 wz
vim
myvim
myvim
q;:q

asd
q

Merge branch 'master' of https://github.com/w7121544/myvim

Conflicts:
	.vim/.netrwhist
	.vim/bundle/bash-support.vim
	.vim/bundle/html5.vim
	.vim/bundle/vim-easymotion
	.vim/bundle/vundle
	.vimrc
myvim
qwe