Merge branch 'master' of github.com:feniix/oh-my-zsh
Merge branch 'master' of github.com:feniix/oh-my-zsh