Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard

src/main/java/seng302/models/Yacht.java

@@ -174,4 +174,9 @@ public class Yacht {
     public void setMarkRoundingTime(Long markRoundingTime) {
         this.markRoundingTime = markRoundingTime;
     }
+
+    @Override
+    public String toString() {
+        return boatName;
+    }
 }