コミット
Merge branch 'master' of github.com:cameraion/edi-workshop-git

Conflicts:
	README.md

競合解決！