modified 2 files
Merge branch 'master' of github.com:iu2fish/oh-my-zsh

merge the file
modified tem