fixed some merge errors

Assets/Scenes/Menus/Lobby.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d80697018f7e0cb57334c5778dee14be78ec04e3bfa231fbe8042f9073677988
-size 46425
+oid sha256:522af36cedf7538607021871c5d833031446e7f40e07626f5e059e0d323ceb9e
+size 46401

Assets/Scripts/Character.cs

@@ -22,6 +22,7 @@ public class Character : MonoBehaviour
     public bool underRock = false;
     public bool stuck = false; //Am I still stuck?
     public bool justMoved = false; //Was the logic block I just executed a move command?
+    public bool inPit = false;
     Vector3 death = new Vector3(-50, 0, 0);
     #region Inspector Fields