Changed: `.gitconfig` ea employee setting
Save ea settings
Now open tabbed multiple file on vim
Merge commit '873419ac'

Conflicts:
	.gitconfig
	.gitmodules
	.vim