my local changes
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
changes to the theme
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
my updates to the theme
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh