No idea...
Merge branch 'master' of github.com:someboddy/vimConfig

Conflicts:
	.gitmodules