for merge
Merge branch 'master' of github.com:carlesfe/dotfiles

Conflicts:
	.vim/.netrwhist