管理方法変更
jjMerge branch 'master' of https://github.com/mozikke/.zsh.d

Conflicts:
	.tmux.conf
	.zshrc