ildjfdlj
Merge branch 'master' of https://github.com/ldonoso/varios

Conflicts:
	vimfiles/_vimrc