座標を修正
座標を修正
test
Merge remote-tracking branch 'origin/yuuki2' into na3alf6_testing

Conflicts:
	testprogram