Merge remote-tracking branch 'remotes/origin/master' into story28

-anchors now fills stage -added time label # Conflicts: # pom.xml # src/main/java/seng302/Controllers/RaceController.java # src/main/resources/scenes/racepane.fxml #pair[fwy13, hba56] #story[761]
2017-04-19 12:48:03 +12:00
parent a00b066f8d 4e78ae2ae7
commit edabe58b03
16 changed files with 516 additions and 281 deletions
@@ -28,11 +28,20 @@
            <artifactId>mockito-all</artifactId>
            <version>1.9.5</version>
        </dependency>
+
        <dependency>
            <groupId>com.github.bfsmith</groupId>
            <artifactId>geotimezone</artifactId>
            <version>1.0.3</version>
        </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.11</version>
+            <scope>test</scope>
+        </dependency>
+
    </dependencies>