Arreglo local
Merge branch 'master' of https://github.com/mcanan/vim-config

Conflicts:
	vimrc