差分反映１
miyashita merge
Merge branch 'develop' of https://github.com/tadasuke/kizuna_api into develop

Conflicts:
	html/index.php