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

Conflicts:
	watanabe/index.php
mastertest2
Merge pull request #16 from nabeqo/proj/mastertest2

Proj/mastertest2