Merge remote-tracking branch 'origin/master'

# Conflicts:
#	PositionSerialize.cs

PositionSerialize.cs

@@ -20,6 +20,7 @@ void Start ()
     {
         modelName = armature.transform.parent.gameObject.name;
         filePath = directory + modelName + lastFileIndex + ".txt";
+<<<<<<< HEAD
         boneCount = armature.transform.childCount;
 
         ////If file already exists, find last file count & set filePath to last file.
@@ -34,6 +35,11 @@ void Start ()
     }
 
     void Update ()
+=======
+	}
+
+	void Update ()
+>>>>>>> origin/master
     {
         if (Input.GetKeyDown(KeyCode.V))
             WritePositions();
@@ -87,4 +93,4 @@ void ReadPositions()
         }
         reader.Close();
     }
-}
+}

README.md

@@ -0,0 +1,4 @@
+# Darktober-Game-Jam
+Game for Darktober Game Jam
+
+So the idea for this game is basically the Face Lift game from Mario Party, but Halloween type stuff instead.