分割.bashrc; 添加zsh
Merge branch 'master' of github.com:logevery/dotfiles

Conflicts:
	.shell.sh
	.zshrc
merge conflicts