merge fix

CheckersClient/core/src/com/mygdx/game/controllers/NetworkController.java

@@ -3,12 +3,10 @@ package com.mygdx.game.controllers;
 import com.badlogic.gdx.utils.Queue;
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryonet.Client;
-<<<<<<< HEAD
 import com.esotericsoftware.kryonet.Server;
 import com.mygdx.game.UniCheckersClient;
-=======
 import com.mygdx.game.controllers.commands.Command;
->>>>>>> origin/master
+
 
 import java.io.IOException;