update
Merge branch 'master' of https://github.com/liang8305/oh-my-zsh