Merge branch 'master' of https://github.com/SunriseDigital/improve-condition
Merge branch 'proj/forkTest3'

Conflicts:
	watanabe/index.php
Merge branch 'master' of https://github.com/SunriseDigital/improve-condition
Merge branch 'master' of https://github.com/SunriseDigital/improve-condition
add test.php forktest4
Merge branch 'master' of https://github.com/SunriseDigital/improve-condition
Merge branch 'master' into proj/forktest4
Merge pull request #18 from nabeqo/proj/forktest4

Proj/forktest4