merge
Merge branch 'master' of https://github.com/YuuShigetani/dotfiles
setup.sh fix