Merge branch 'master' into story_64_sails

# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
#	racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java

racevisionGame/src/test/java/mock/xml/RaceXMLCreatorTest.java

@@ -0,0 +1,31 @@
+package mock.xml;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import shared.dataInput.RaceXMLReader;
+import shared.exceptions.InvalidRaceDataException;
+import shared.exceptions.XMLReaderException;
+
+import javax.xml.bind.JAXBException;
+
+import static org.mockito.Mockito.mock;
+
+public class RaceXMLCreatorTest {
+
+    String fileToTest = "mock/mockXML/raceSchemaTest.xml";
+    @Mock
+    RaceXMLReader reader;
+
+
+    @Before
+    public void setup() throws XMLReaderException, JAXBException, InvalidRaceDataException {
+
+    }
+
+    @Test
+    public void getLineAngleTest(){
+
+    }
+
+}