フォークテスト2　コミット
Merge branch 'master' of github.com:SunriseDigital/improve-condition

Conflicts:
	watanabe/index.php
Merge branch 'master' of https://github.com/SunriseDigital/improve-condition

Conflicts:
	watanabe/index.php