[追加]タイトルとイベントのテクスチャを追加
[追加]エフェクトの追加
Merge branch 'master' of https://github.com/mstn2014/OsakaGenkiProject

Conflicts:
	Assets/Resources/Setting/Game1_Setting.asset
	Assets/Resources/Setting/Game1_Setting.cs
	Assets/Scenes/game2.unity
	Assets/Users/Shingaki/C#/CountDown.cs
	Assets/Users/Shingaki/C#/EffectMgr.cs
	Assets/Users/Shingaki/C#/ObjMgr.cs
	Assets/Users/Shingaki/C#/Question.cs
[追加]サウンド追加
Merge branch 'master' of https://github.com/mstn2014/OsakaGenkiProject
[追加]ゲーム３作り直した
Merge branch 'master' of https://github.com/mstn2014/OsakaGenkiProject

Conflicts:
	Assets/Resources/Prefab/Game2.meta
	Assets/Resources/Setting/Game3Setting.cs
	Assets/Scenes/game3.unity
	Assets/Scripts/Game3/Game3_Flowing.cs