updated
Merge branch 'master' of https://github.com/Tacahilo/myzsh

Conflicts:
	zsh.d/z