サウンドを２Dに変更　ステージジェネレータ(仮)ついか
no message
Merge branch 'master' of https://github.com/iwatowake/GGJ2014_F

Conflicts:
	UnityProject/Assembly-CSharp-firstpass-vs.csproj
	UnityProject/Assembly-CSharp-firstpass.csproj
	UnityProject/Assembly-CSharp-vs.csproj
	UnityProject/Assembly-CSharp.csproj
	UnityProject/Assembly-UnityScript-Editor-vs.unityproj
	UnityProject/Assembly-UnityScript-Editor.unityproj
	UnityProject/Assembly-UnityScript-firstpass-vs.unityproj
	UnityProject/Assembly-UnityScript-firstpass.unityproj
	UnityProject/UnityProject-csharp.sln
	UnityProject/UnityProject.sln
no message