新機能３
新機能の更新
Merge remote-tracking branch 'origin/new_func3'

Conflicts:
	index.php
Merge branch 'master' of https://github.com/bigplants/test.git

Conflicts:
	index.php