Merge branch 'master' of github.com:yasulab/dot-files
Ignore oh-my-zsh