fucking trouble
Merge branch 'master' of github.com:machouinard/oh-my-zsh-custom
Merge branch 'master' of github.com:machouinard/oh-my-zsh-custom