Add chruby to .zshrc
Merge branches