ちょっと修正
Merge branch 'master' of github.com:morishin/dotfiles

Conflicts:
	_zshrc.alias