oh my zsh
Merge branch 'master' of github.com:CJNE/dot
Merge branch 'master' of github.com:CJNE/dot