fix: merge

Assets/Scripts/GameManager.cs

@@ -15,7 +15,7 @@ public class GameManager : MonoBehaviour
 {
     private GameState currentState;
     private List<Player> players = new List<Player>();
-    private Player currentPlayer = null;
+    public Player currentPlayer = null;
 
 
 

Assets/Scripts/RoomManager.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
-using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Linq;

Packages/packages-lock.json

@@ -69,6 +69,13 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.2.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.performance.profile-analyzer": {
       "version": "1.2.2",
       "depth": 1,