branch b
Merge branch '分岐B'

Conflicts:
	hello_world.php
元に戻す