間違った分を消せるかな？ reset.
Merge branch 'master' of https://github.com/marshi/git_training.git