better compatibility with zsh
Merge branch 'master' of github.com:/nah00m/dotfiles

Conflicts:
	.zshrc