zshrc
Updating
Updating
Merge branch 'master' of gh:g12r/dotfiles

Conflicts:
	.zshrc
	.zshrc.orig