modify gitconfig
modify vimrc
Merge branch 'sanritz'
modigy gitconfig