commit 00
Merge branch 'master' of https://github.com/UzawaAkira/edi-workshop-git

Conflicts:
	README.md