Removed commented out code. Merged master in.

#story[1097]

racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java

@@ -22,16 +22,8 @@ public class TackGybeCommand implements Command {
         this.boat = boat;
     }
 
-    //The refactoring of MockRace will require changes to be made
     @Override
     public void execute() {
-        /*if(boat.getBearing().degrees()>180){
-            boat.setBearing(Bearing.fromDegrees(360 - race.getWindDirection().degrees()));
-        } else {
-            boat.setBearing(Bearing.fromDegrees(race.getWindDirection().degrees()));
-        }*/
-        /*double angle = Math.max(race.getWindDirection().degrees(), boat.getBearing().degrees()) - Math.min(race.getWindDirection().degrees(), boat.getBearing().degrees());
-        boat.setBearing(Bearing.fromDegrees(angle));*/
         double boatAngle = boat.getBearing().degrees();
         double windAngle =race.getWindDirection().degrees();
         double differenceAngle = calcDistance(boatAngle, windAngle);

racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java

@@ -20,7 +20,6 @@ public class VMGCommand implements Command {
         this.boat = boat;
     }
 
-    //The refactoring of MockRace will require changes to be made
     @Override
     public void execute() {
         if (boat.getAutoVMG()){