local commit
変更
Merge branch 'master' of github.com:ManabuSeki/git_tutorial

Conflicts:
	README.md