diff --git a/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial b/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial
index bd32d04..03926b4 100644
Binary files a/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial and b/IronToad_UnityProject/Assets/Physics Materials/Water.physicMaterial differ
diff --git a/IronToad_UnityProject/Assets/Scripts/DontRotate.cs b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs
new file mode 100644
index 0000000..584f172
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DontRotate : MonoBehaviour {
+
+    private Quaternion originalRot;
+	// Use this for initialization
+	void Start () {
+        originalRot = transform.rotation;
+	}
+	
+	// Update is called once per frame
+	void Update () {
+        transform.rotation = originalRot;
+	}
+}
diff --git a/IronToad_UnityProject/Assets/Scripts/DontRotate.cs.meta b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs.meta
new file mode 100644
index 0000000..9899ceb
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Scripts/DontRotate.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 676629218e9aa15459d02d01dea3c546
+timeCreated: 1485038957
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540
new file mode 100644
index 0000000..a809e82
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7a2ebb0518fbb4d46a3aa17dac934dce
+timeCreated: 1485038927
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta b/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta
index 713e4e7..dc8b858 100644
--- a/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta
+++ b/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta
@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 7562c5d08f15d254c92f6dbd50cd18c9
 timeCreated: 1485039339
 licenseType: Pro
+=======
+guid: 0fb49e3e0a97c2c4cb531c04d67f2615
+timeCreated: 1485038927
+licenseType: Free
+>>>>>>> 927ced4c4317bc1f86f167c9b1594cec30b8e540
 DefaultImporter:
   userData: 
   assetBundleName: 
diff --git a/IronToad_UnityProject/Assets/Sound/Music.meta b/IronToad_UnityProject/Assets/Sound/Music.meta
new file mode 100644
index 0000000..b3ddd5b
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Sound/Music.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1715d56e0d2b68246a82993db31014ab
+folderAsset: yes
+timeCreated: 1485038927
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta b/IronToad_UnityProject/Assets/Sound/SFX.meta
new file mode 100644
index 0000000..795aecf
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Sound/SFX.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: de5a3adcedb96f64183518ac89622ade
+folderAsset: yes
+timeCreated: 1485038927
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/Textures.meta b/IronToad_UnityProject/Assets/Textures.meta
new file mode 100644
index 0000000..ffdd440
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Textures.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 2a6e699820a38a544acfc0015eb679a2
+folderAsset: yes
+timeCreated: 1484972317
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta
new file mode 100644
index 0000000..47507ca
--- /dev/null
+++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 338533d5d159c00478a9fb5321b7d922
+folderAsset: yes
+timeCreated: 1485007190
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
index c7c2736..3ccb46e 100644
Binary files a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity and b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity differ