Varios cambios
Merge branch 'master'

Conflicts:
	.vimrc