Commit 7
Merge branch 'branch2'

Conflicts:
	hello_world.php