Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story62_Creating_Game_Loop

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java

src/main/java/seng302/gameServer/GameState.java

@@ -66,6 +66,14 @@ public class GameState {
         GameState.currentStage = currentStage;
     }
 
+    public static Double getWindDirection() {
+        return windDirection;
+    }
+
+    public static Double getWindSpeed() {
+        return windSpeed;
+    }
+
     public static void updateBoat(Integer sourceId, BoatActionType actionType) {
         switch (actionType) {
             case VMG: