+++
Merge branch 'master' of https://github.com/ybycode/vim-config

Conflicts:
	vimrc