ステージ2のブロックを配置
Merge branch 'master' of https://github.com/iwatowake/GGJ2014_F
Merge branch 'master' of https://github.com/iwatowake/GGJ2014_F
BGM差し替え
Merge branch 'master' of https://github.com/iwatowake/GGJ2014_F

Conflicts:
	UnityProject/Assets/Prefabs/Clock.prefab
	UnityProject/Assets/Prefabs/Key.prefab
	UnityProject/Assets/Scenes/Stage1.unity
	UnityProject/UnityProject.userprefs
マスター版