zsh shell quick update
Merge branch 'master' of https://github.com/nettapper/dotfiles

Conflicts:
	.oh-my-zsh