changed .zshrc
Merge branch 'master' of github.com:yoneshin/dotfiles

Conflicts:
	.zshrc