step05を追加/local
Merge branch 'master' of https://github.com/Uema-Kenta/github-repo03

Conflicts:
	readme.txt
step06の追加/local
Merge branch 'master' of https://github.com/Uema-Kenta/github-repo03

Conflicts:
	readme.txt