Fix
Merge branch 'master' of github.com:saka39/dotfiles

Conflicts:
	.zshrc
	.zshrc.osx