Changed Collisions, and merged master

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

@@ -418,7 +418,7 @@ public class Boat extends Collider {
     @Override
     public boolean rayCast(Boat boat) {
         if(boat != this) {
-            return rayCast(boat, 50);
+            return rayCast(boat, 15);
         } else return false;
     }
 

racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java

@@ -62,7 +62,7 @@ public class HostGameController extends Controller {
         });
 
         // set values and marks to be displayed
-        sliderLength.setMin(2);
+        sliderLength.setMin(5);
         sliderLength.setMax(MAX_RACE_LENGTH);
         sliderLength.setShowTickLabels(true);
         sliderLength.setMajorTickUnit(MAX_RACE_LENGTH-1);