[修正]
Merge branch 'master' of https://github.com/mstn2014/OsakaGenkiProject

Conflicts:
	Assets/Resources/Prefab/Game2.meta
	Assets/Scenes/game2.unity
一旦コミット
Merge branch 'master' of https://github.com/mstn2014/OsakaGenkiProject
[修正]フレーム関連の不具合修正