vimrc
Merge branch 'master' of github.com:g-andrade/dotfiles

Conflicts:
	vimrc