バトル画面を実装
Merge branch 'master' of https://github.com/kyorop/NumakuroSimulation

Conflicts:
	NumakuroSimulation/NumakuroSimulation/IventSelectScene.cpp
	NumakuroSimulation/NumakuroSimulation/Log.txt
あ
Merge branch 'master' of https://github.com/kyorop/NumakuroSimulation

Conflicts:
	NumakuroSimulation/NumakuroSimulation/IventSelectScene.cpp
	NumakuroSimulation/NumakuroSimulation/Log.txt
発表した版
Log.txtをignore
Merge branch 'master' of https://github.com/kyorop/NumakuroSimulation