modified:   zshrc
Merge branch 'master' of https://github.com/kuntau/dotfiles
Merge branch 'master' of https://github.com/kuntau/dotfiles