fix
fix
Merge branch 'master' of https://github.com/sorin-ionescu/prezto
add
Merge branch 'master' of https://github.com/sorin-ionescu/prezto
Merge branch 'master' of github.com:CandySunPlus/dot_zsh

Conflicts:
	runcoms/zshenv