remobe push config of git
modify vimrc
Merge branch 'sanritz'

Conflicts:
	_gitconfig