refactor
Merge branch 'master' of github.com:j5ik2o/dotfiles

Conflicts:
	.zshrc