Scene updated.
Merge branch 'master' of https://github.com/wallacet/HorrorWonderLand-GJ-11-14

Conflicts:
	Assets/Prefabs/Main Character.prefab
	Assets/scene1.unity
Update scene.
Merge branch 'master' of https://github.com/wallacet/HorrorWonderLand-GJ-11-14