update zsh theme
Merge remote-tracking branch 'origin/master'

Conflicts:
	_zsh_/theme.zsh