Merge remote-tracking branch 'origin/master' into story_51_rounding_fix

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java

Also added keybindings.xml to git ignore.
#story[1185]

racevisionGame/src/main/java/shared/model/RaceClock.java

@@ -3,6 +3,7 @@ package shared.model;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import org.jetbrains.annotations.Nullable;
+import visualiser.Controllers.RaceStartController;
 import visualiser.model.ResizableRaceCanvas;
 
 import java.time.Duration;
@@ -15,8 +16,8 @@ import java.util.Date;
  * This class is used to implement a clock which keeps track of and
  * displays times relevant to a race. This is displayed on the
  * {@link ResizableRaceCanvas} via the
- * {@link visualiser.Controllers.RaceController} and the
- * {@link visualiser.Controllers.StartController}.
+ * {@link visualiser.Controllers.RaceViewController} and the
+ * {@link RaceStartController}.
  */
 public class RaceClock {