vim file
Merge branch 'master' of github.com:carlesfe/dotfiles

Conflicts:
	.vim/spell/en.utf-8.add
	.vim/spell/en.utf-8.add.spl