shit
Merge branch 'master' of github.com:machouinard/oh-my-zsh-custom
merged changes from remote version of chouinard zsh theme
Merge branch 'master' of github.com:machouinard/oh-my-zsh-custom
added macbook theme and a backup of .zshrc
Merge branch 'master' of github.com:machouinard/oh-my-zsh-custom