Zsh setup
Added prompt
Merge branch 'master' of https://github.com/7h3kk1d/prezto

Conflicts:
	runcoms/zpreztorc