更新
Merge branch 'master' of https://github.com/kyorop/NumakuroSimulation

Conflicts:
	NumakuroSimulation/NumakuroSimulation/Log.txt
	NumakuroSimulation/NumakuroSimulation/OpeningScene.cpp
	NumakuroSimulation/NumakuroSimulation/OpeningScene.h
競合解決
Merge branch 'master' of https://github.com/kyorop/NumakuroSimulation