Fixed:
Merge branch 'master' of github.com:kazufusa/dotfiles

Conflicts:
	zsh/zshenv
	zsh/zshrc
Added