*zshrc
Merge branch 'master' of github.com:ran9er/init.emacs