Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory

# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java

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

@@ -43,18 +43,6 @@ public abstract class Race implements Runnable {
      */
     protected LatestMessages latestMessages;
 
-    /**
-     * The sequence number of the latest BoatLocation message sent or received.
-     */
-    protected int boatLocationSequenceNumber = 1;
-
-    /**
-     * The sequence number of the latest RaceStatus message sent or received.
-     */
-    protected int raceStatusSequenceNumber = 1;
-
-
-
     /**
      * A list of compound marks in the race.
      */
@@ -364,4 +352,8 @@ public abstract class Race implements Runnable {
             this.lastFpsResetTime = 0;
         }
     }
+
+    public int getRaceId() {
+        return raceId;
+    }
 }