update
Merge branch 'master'
rearrange zshrc