Merge pull request #16 from nabeqo/proj/mastertest2

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

Conflicts:
	watanabe/index.php