Add forked pbrown/oh-my-zsh
Zsh git set color for disabled statusline
Merge remote-tracking branch 'origin/master'

Conflicts:
	.oh-my-zsh