Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a

# Conflicts:
#	Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs

Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs

@@ -40,11 +40,11 @@ public class RacetrackGameMode : GameMode
         {
             Camera.main.transform.Translate(scrollSpeed, 0, 0, Space.World);
             mapManager.checkTrack();
-            Debug.Log("New camera position at x = " + Camera.main.transform.position.x);
+            //Debug.Log("New camera position at x = " + Camera.main.transform.position.x);
         }
         else
         {
-            Debug.Log("Not scrolling");
+            //Debug.Log("Not scrolling");
         }
 
         //At the end of each round, any stuck players are freed to resume moving next round
@@ -52,7 +52,7 @@ public class RacetrackGameMode : GameMode
         {
             player.character.stuck = false;
 
-            if (player.character.inPit)
+            if (player.character.inPit && player.client.Lives > 0)
             {
                 player.character.respawnCharacter();
             }