Merge branch 'tomme'

Assets/Prefabs/Enemies/Flying Platform.prefab

@@ -129,7 +129,7 @@ SpriteRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 2100000, guid: 29e4a79a79b470fd5b3021938034169a, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -5205,15 +5205,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e42b5206757167a4eb0de34f54ab98ed, type: 3}
---- !u!1 &6241724066686691529 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6490983961685056084, guid: e42b5206757167a4eb0de34f54ab98ed,
-    type: 3}
-  m_PrefabInstance: {fileID: 903980468320547485}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6241724066686691532 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6490983961685056081, guid: e42b5206757167a4eb0de34f54ab98ed,
     type: 3}
   m_PrefabInstance: {fileID: 903980468320547485}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6241724066686691529 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6490983961685056084, guid: e42b5206757167a4eb0de34f54ab98ed,
+    type: 3}
+  m_PrefabInstance: {fileID: 903980468320547485}
+  m_PrefabAsset: {fileID: 0}