Merge pull request #4 from shadow8t4/alex

Update master with Android build fix.

MoCha/Assets/Scripts/InventoryEditor.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+#if UNITY_EDITOR
 using UnityEditor;
 [CustomEditor(typeof(Inventory))]
 public class InventoryEditor : Editor
@@ -36,4 +37,5 @@ public class InventoryEditor : Editor
 		EditorGUI.indentLevel--;
 		EditorGUILayout.EndVertical ();
 	}
-}
+}
+#endif

README.md

@@ -1,2 +1,14 @@
-# MoChaApp
-A unity project version of a monster chasing fitness app for CSCE 482
+# Monster Chase
+
+Unity front end client of a gamified fitness app for CSCE 482.
+
+Create a monster and run!
+
+## Development Details
+
+This client unity app will mostly just be pulling data
+from a connected fitbit device and the server backend
+of our fitness game.
+
+Its server backend companion github can be found here:
+https://github.tamu.edu/rhetorical575/mocha-server