initial2
vimrc added
Merge branch 'master' of github.com:emilo/vimconf

Conflicts:
	.gitmodules