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

Conflicts:
	db/db-haiku.php