Merge remote-tracking branch 'origin/sprint4_master' into 33CherryPick

This commit is contained in:
Erika Savell
2017-05-25 01:15:14 +12:00
4 changed files with 210 additions and 404 deletions
@@ -217,7 +217,6 @@ public class ResizableRaceCanvas extends ResizableCanvas {
*/
public void update() {
this.draw();
this.updateBoats();
}
/**