Fix
Merge branch 'master' of github.com:edelprino/Dotfiles

Conflicts:
	vim/vimrc