remove trash and EDITOR
change EDITOR and trash
Merge branch 'master' of https://github.com/kawa1128/dotfile

Conflicts:
	zsh/.zshrc
change PROMPT