lg
Merge branch 'master' of github.com:andregro/vimrc

Conflicts:
	.gitconfig