x
Merge branch 'master' of https://github.com/kba/zsh-config

Conflicts:
	aliases
	zprofile