added git branch to prompt
Merge branch 'master' of github.com:gtorrico/dotfiles

Conflicts:
	zshenv