1
Merge branch 'master' of https://github.com/mtuzinskiy/vim_config

Conflicts:
	.vimrc