Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/ShipWarfare.java
#	src/TaipanShop.java

src/Player.java

@@ -11,6 +11,21 @@ public class Player {
     private int guns = 3;
     private int HP = 100;
 
+    public Player(){
+
+    }
+
+    public Player(Player player){
+        this.bank = player.bank;
+        this.money = player.money;
+        this.opiumHeld = player.opiumHeld;
+        this.silkHeld = player.silkHeld;
+        this.generalHeld = player.generalHeld;
+        this.armsHeld = player.armsHeld;
+        this.location = player.location;
+        this.guns = player.guns;
+        this.HP = player.HP;
+    }
 
     public String getName() {
         return name;
@@ -115,15 +130,4 @@ public class Player {
         System.out.println("Game over");
     }
 
-    public static void main(String[] args) throws Exception {
-        ShipWarfare littyWarfare = new ShipWarfare();
-        TaipanShop littyShop = new TaipanShop();
-
-        littyShop.shop();
-
-        littyWarfare.peasantFleetAttack();
-
-        littyShop.shop();
-    }
-
 }