change PS1
add
fix conflict
add -s
Merge branch 'master' of https://github.com/yinchunxiang/zsh

Conflicts:
	zsh_config.sh
	zshrc