updated oh-my-zsh
merge oh-my-zsh
merge