Merge remote-tracking branch 'origin/master'

# Conflicts:
#	out/production/TaipanClone/ShipWarfare.class

src/Player.java

@@ -211,6 +211,7 @@ public class Player {
     public void gameOver(){
         System.out.flush();
         System.out.println("Game over");
+        System.exit(0);
     }
 
 }