Fixed Merge and added back some merge changes #story[1196]

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>

racevisionGame/src/main/java/mock/model/NewPolars.java

@@ -179,13 +179,39 @@ public class NewPolars {
 
     }
 
+    /**
+     * gets the angle bound between 0 and 360 following modular arithmetic
+     * @param angle angle to modulate
+     * @return resultant angle after modulation.
+     */
     public static double modulateAngle(double angle){
         return (angle % 360 + 360) % 360;
     }
 
+    /**
+     * DO NOT DELETE THIS FUNCTIONS THEY ARE USED FOR TESTING PURPOSES
+     * @return current polars map
+     */
     @SuppressWarnings("unused")
     private Map<Double, TreeMap<Double, Double>> getPolars(){
         //this function is just for testing so therefore it is private
         return polars;
     }
+
+    /**
+     * DO NOT DELETE THESE FUNCTIONS THEY ARE USED FOR TESTING PURPOSES
+     * @return nothing
+     */
+    @SuppressWarnings("unused")
+    private void printOutLinearInterpolated(){
+        for (double tws: polars.keySet()){
+            System.out.println("==================================================");
+            System.out.println("Speed: " + tws);
+            System.out.println("==================================================");
+            for (double twa: polars.get(tws).keySet()){
+                System.out.println("TWA: " + twa + ", Boat Speed: " + polars.get(tws).get(twa));
+            }
+        }
+    }
+
 }

racevisionGame/src/test/java/shared/model/BearingTest.java

@@ -1,5 +0,0 @@
-package shared.model;
-
-public class BearingTest {
-//TODO
-}