edite 3
Merge branch 'master' of https://github.com/Yohei-Takaku/Hello-world

Conflicts:
	hello-world.php