Merge branch 'master' into storyB-)

# Conflicts:
#	racevisionGame/src/main/java/shared/model/Constants.java

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

@@ -5,7 +5,6 @@ package shared.model;
  * Created by Erika on 19-Mar-17.
  */
 public class Constants {
-
     /**
     * Multiply by this factor to convert nautical miles to meters.
     * <br>
@@ -15,8 +14,6 @@ public class Constants {
     */
     public static final int NMToMetersConversion = 1852;
 
-
-
     /**
     * Multiply by this factor to convert Knots to millimeters per second.
      * <br>
@@ -26,8 +23,6 @@ public class Constants {
     */
     public static final double KnotsToMMPerSecond = 514.444;
 
-
-
     /**
      * The scale factor of the race.
      * Frame periods are multiplied by this to get the amount of time a single frame represents.
@@ -38,20 +33,13 @@ public class Constants {
     /**
      * The race pre-start time, in milliseconds. 3 minutes.
      */
-    //
-    // TODO: CHANGE BACK TO 3 MINUTES BEFORE MERGING TO MASTER
-    public static final long RacePreStartTime = 30000; //3 * 60 * 1000;
-
+    public static final long RacePreStartTime = 3 * 60 * 1000;
 
     /**
      * The race preparatory time, in milliseconds. 1 minute.
      */
     public static final long RacePreparatoryTime = 1 * 60 * 1000;
 
-
-
-
-
     /**
      * The number of milliseconds in one hour.
      * <br>
@@ -69,7 +57,4 @@ public class Constants {
      * Divide by this factor to convert hours to seconds.
      */
     public static long OneHourSeconds = 1 * 60 * 60;
-
-
-
 }