Merge branch 'master' of github.com:kento-r1/haikudosu

Conflicts:
	controller/create-kukai.php
	controller/main.log
Merge remote-tracking branch 'origin/master'