step05追加
step06/local追加
Merge branch 'master' of https://github.com/kenta-kinjo/github-repo03

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

Conflicts:
	readme.txt