zshrc
Merge branch 'master' of github.com:xuender/ubuntu