細かい修正
Merge branch 'master' of https://github.com/kyorop/NumakuroSimulation

Conflicts:
	NumakuroSimulation/NumakuroSimulation/GameManager.cpp