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

Conflicts:
	controller/haiku-favorite.php
Merge branch 'master' of https://github.com/kento-r1/haikudosu

Conflicts:
	controller/haiku-favorite.php