Adding a.vim and F11 to activate it
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules