resolved merge conflicts

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

@@ -26,21 +26,6 @@ public class Dealer{
 
     }
 
-<<<<<<< HEAD
-=======
-    public int getValueOfHand(ArrayList<Card> hand)
-    {
-        int value=0;
-        for (int i=0; i<hand.size();i++)
-        {
-            value+=hand.get(i).getValue();
-
-        }
-        return value;
-    }
-
-
->>>>>>> feat/deckandcard
     public void DealersTurn() {
         while (dealerhand.getValue() < 17) {
             this.dealerhand.add(dealCard());