(・ω<)
Merge branch 'master' of https://github.com/mstn2014/OsakaGenkiProject

Conflicts:
	Assets/Resources/SaveData/SaveData.asset
ゲーム2　出現人数調整