Fix conflict
Merge branch 'master' of https://github.com/jaapz/dotfiles

Conflicts:
	zsh/zshrc
Merge branch 'master' of https://github.com/jaapz/dotfiles