change option
Merge branch 'master' of github.com:mopp/dotfiles

Conflicts:
	.zshrc