Fixed some merge issues.

racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java

@@ -88,7 +88,7 @@ public class ConnectionAcceptor implements Runnable {
 
                 DataOutputStream outToVisualiser = new DataOutputStream(mockSocket.getOutputStream());
                 MockOutput mockOutput = new MockOutput(latestMessages, outToVisualiser);
-                ControllerServer controllerServer = new ControllerServer(mockSocket); //TODO probably pass assigned boat source ID into ControllerServer.
+                ControllerServer controllerServer = new ControllerServer(mockSocket, this.rl); //TODO probably pass assigned boat source ID into ControllerServer.
 
                 new Thread(mockOutput, "ConnectionAcceptor.run()->MockOutput thread" + mockOutput).start();
                 new Thread(controllerServer, "ConnectionAcceptor.run()->ControllerServer thread" + controllerServer).start();

racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java

@@ -72,7 +72,7 @@ public class ControllerServer extends Observable implements Runnable {
                     try {
                         boatActionDecoder.decode(encodedMessage.getMessageBody());
                         BoatAction boatAction = boatActionDecoder.getMessage();
-                        action = boatActionDecoder.getBoatAction();
+                        action = boatAction.getBoatAction();
 
                         // Notify observers of most recent action
                         this.notifyObservers();