移動とか
Merge branch 'master' of https://github.com/kyorop/NumakuroSimulation

Conflicts:
	NumakuroSimulation/NumakuroSimulation/Log.txt