vimrc++
Merge branch 'master' of github.com:delehef/zshrc

Conflicts:
	.vimrc
Merge