zshrc add alias diff
gitignore update
Merge branch 'master' of https://github.com/hosoya/dotfiles