merged jonDev with master

src/main/java/io/zipcoder/casino/CardGame.java

@@ -75,4 +75,8 @@ public abstract class CardGame {
     public Player getWinner() {
         return winner;
     }
+
+    public int getHandSize() {
+        return handSize;
+    }
 }

src/main/java/io/zipcoder/casino/Console.java

@@ -44,7 +44,7 @@ public class Console {
                 break;
 
             case "yahtzee":
-                Game yahtzee = new Yahtzee();
+                Game yahtzee = new Yahtzee(player);
                 yahtzee.StartGame();
                 break;
 

src/main/java/io/zipcoder/casino/War.java

@@ -91,6 +91,8 @@ public class War extends CardGame implements Gamble, Game {
                 CardPlayer player = super.getPlayers().get(i);
                 //add the card to their hand
                 player.getHand().add(card);
+                //remove the card from the deck
+                super.getDeck().remove(card);
             }
         }
     }