1234
Merge branch 'head2'

Conflicts:
	index.php
head2 にしたよw
Merge branch 'master' into head2

Conflicts:
	index.php