Merge remote-tracking branch 'upstream/master'
modified theme
Merge branch 'master' of https://github.com/digitalstep/oh-my-zsh.git