resolved merge conflicts

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

@@ -18,26 +18,26 @@ public class Dealer{
  //       this.dealerhand = dealerhand;
   //  }
 
-    Hand dealerhand = new Hand();
-    Hand playerhand = new Hand();
+    Hand dealerhand = new Hand(null);
+    Hand playerhand = new Hand(null);
 
     public void Deal(BlackJackPlayer p) {
-        p.getHand().addCard(deck.pop())
+//        p.getHand().addCard(deck.pop())
 
     }
 
     public void DealersTurn() {
         while (dealerhand.getValue() < 17) {
-            this.dealerhand.add(dealCard());
+//            this.dealerhand.add(dealCard());
         }
         int playervalue = playerhand.getValue();
         int dealervalue = dealerhand.getValue();
 
         if (playervalue > dealervalue) {
-            wallet.addMoney(wallet.getMoney());// player WON
+//            wallet.addMoney(wallet.getMoney());// player WON
             // add bet to players wallet
         } else {
-            wallet.takeMoney(wallet.getMoney());
+//            wallet.takeMoney(wallet.getMoney());
             // player LOST
             //takeMoney(getBet()); // from players wallet
         }