Merge branch 'temp1'
Merge branch 'sanritz'
Merge branch 'sanritz'
modigy gitconfig
add dotfiles of bash
modifi vim setting
Merge branch 'sanritz'

Conflicts:
	_zshrc
modigy copy option of vim
alias
Merge branch 'master' into sanritz