merge Switch

Conflicts:
	Assets/Prefabs/PlayerSound.prefab
	Assets/Prefabs/SoundRay.prefab
	Assets/Scripts/Door.cs