Hopefully fixed what the merge messed up

MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 297cf2de6c239934ba985a97912b24c4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Stashed changes.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d09540dbafa36436c910a9a2fbf9c191
+guid: 602763653dee1c94f86c93c46a01efac
-PrefabImporter:
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

MuseumGame/Assets/Scenes/MatthewTestScene.unity.meta~Updated upstream.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ce6abb1e102545240939a18c71a13801
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MuseumGame/ProjectSettings/TagManager.asset

@@ -5,6 +5,7 @@ TagManager:
   serializedVersion: 2
   tags:
   - EnemyProjectile
+  - Platform
   layers:
   - Default
   - TransparentFX