prettier oh-my-zsh theme
Merge remote-tracking branch 'github/master'

restore comments

Conflicts:
	.zshrc