Merge branch 'master' of github.com:2k0ri/dotfiles
git stashをpullの前後に追加