merge from origin
Merge branch 'master' of github.com:leyyinad/oh-my-zsh