direnvを追加
Merge branch 'master' of github.com:iguto/zsh_dotfiles

Conflicts:
	.zshrc