bugfix 直す
Merge remote-tracking branch 'origin/bugfix'

Conflicts:
	index.php