Merge remote-tracking branch 'origin/master'

.gitignore

@@ -175,3 +175,5 @@ local.properties
 
 # Code Recommenders
 .recommenders/
+
+Makefile

src/main/java/seng302/Event.java

@@ -93,8 +93,7 @@ public class Event {
 	*/
 	public String getEventString(){
 		String currentHeading = Integer.toString(this.getLeg().getHeading());
-		String velocityKnots = String.format("%1.2f", this.getBoat().getVelocity() * 1.943844492); // Convert meters/second to knots
 
-		return (this.getTimeString() + ", " + this.getBoat().getTeamName() + " passed " + this.getLeg().getMarkerLabel() + " going heading " + currentHeading + " at " + velocityKnots + " knots.");
+		return (this.getTimeString() + ", " + this.getBoat().getTeamName() + " passed " + this.getLeg().getMarkerLabel() + " going heading " + currentHeading + "°");
 	}
 }

src/main/java/seng302/Race.java

@@ -113,7 +113,9 @@ public class Race {
 		System.out.println("######################");
 
 		for (int i = 0; i < numberOfBoats; i++) {
-			System.out.println(boats[i].getTeamName());
+			String velocityKnots = String.format("%1.2f", boats[i].getVelocity() * 1.943844492);
+
+			System.out.println(boats[i].getTeamName() + " Velocity: " + velocityKnots);
 		}
 	}