fixed merge conflict

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

+package io.zipcoder.casino;
+
+public class BlackjackPlayer {
+
+    private double wager;
+
+    private double money;
+
+
+    public void blackjackPlayer(double money) {
+
+    }
+
+    public double setBet(double money) {
+
+        this.wager = money;
+
+        return money;
+    }
+
+    public double getBet(double money) {
+
+        this.wager = money;
+
+        return money;
+
+    }
+}

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

+package io.zipcoder.casino;
+
+public class Dealer extends Player {
+    public void dealCards(Player player, Card card){
+
+    }
+
+    public void takeBet(Player player, double money){
+
+    }
+}

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

 package io.zipcoder.casino;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Stack;
 
 public class Deck {
 
-    private List<Card> cards;
+    private static Suit Suit;
+    private static Rank Rank;
+    private Stack<Card> deck;
+
+
 
-    public Integer size(){
 
-        return null;
+    public Deck(){
+        this.deck = new Stack<Card>();
+        for (Suit suit : Suit.values()){
+            for (Rank rank : Rank.values()){
+                deck.push(new Card(suit, rank));
+            }
+        }
     }
 
-    public Card popCard(){
 
-        return null;
+
+    public Integer size(){
+
+        return deck.size();
     }
 
-    public Card pushCard(){
+    public Card popCard(){
 
-        return null;
+        return deck.pop();
     }
 
-    public void isEmpty(){
+    public Card pushCard(Card card){
 
+        return deck.push(card);
     }
 
-    public void shuffleDeck(){
+    public boolean isEmpty(){
+        return deck.isEmpty();
 
     }
 
-    public void peek(){
+    public void shuffleDeck(Stack<Card> deck){
+
+        Collections.shuffle(deck);
 
     }
+
+//    public void peek(Card card){
+//        return deck.peek();
+//
+//}
 }

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

 
     public Hand () {
 
+
         this.cards = new ArrayList<>();
     }
 
         this.cards.add(card);
     }
 
-    public Integer getValue(){
+    public Integer getHandValue(){
 
         return null;
     }

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

 package io.zipcoder.casino;
 
 public enum  Suit {
-    Spade("♤"),
-    Heart("♥"),
-    Club("♧"),
-    Diamond("♢");
+    SPADE("♤"),
+    HEART("♥"),
+    CLUB("♧"),
+    DIAMOND("♢");
 
     private final String symbol;
 

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

 
 public class Wallet {
 
+    private double money;
     private Integer id;
 
-    public double getMoney() {
+    public double getMoney(double money) {
         return money;
     }
 
-    private double money;
-
-    public void addMoney(){
-        money += money;
+    public double addMoney(double money, double amountAwarded){
+        money += amountAwarded;
 
+        return money;
     }
 
-    public void subtractMoney(){
-        money -= money;
+    public double takeMoney(double money, double amountRemoved){
+        money -= amountRemoved;
 
+        return money;
     }
 }

src/test/java/io/zipcoder/casino/TestCard.java

     @Test
     public void getSuitTest(){
         //Given
-        Card aceOfSpade = new Card(Suit.Spade, Rank.Ace);
-        Suit expectedSuit = Suit.Spade;
+        Card aceOfSpade = new Card(Suit.SPADE, Rank.Ace);
+        Suit expectedSuit = Suit.SPADE;
         //When
         Suit actualSuit = aceOfSpade.getSuit();
         //Then
     @Test
     public void getRankTest(){
         //Given
-        Card twoOfHearts = new Card(Suit.Heart, Rank.Two);
+        Card twoOfHearts = new Card(Suit.HEART, Rank.Two);
         Rank expectedRank = Rank.Two;
         //When
         Rank actualRank = twoOfHearts.getRank();
     @Test
     public void getValueTest(){
         //Given
-        Card jackOfClub = new Card(Suit.Club, Rank.Jack);
+        Card jackOfClub = new Card(Suit.CLUB, Rank.Jack);
         Integer expectedValue = 10;
         //When
         Integer actualValue = Rank.Jack.primaryValue;

src/test/java/io/zipcoder/casino/TestDeck.java

+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+import java.util.Stack;
+
+
+public class TestDeck {
+
+    @Test
+    public void testDeckSize(){
+        //Given
+        Stack<Card> deckSize = new Stack<Card>();
+        //When
+
+        //Then
+    }
+
+    @Test
+    public void testPopCard(){
+        //Given
+        //When
+        //Then
+    }
+
+    @Test
+    public void testPushCard(){
+        //Given
+        //When
+        //Then
+    }
+
+    @Test
+    public void testDeckIsEmpty(){
+        //Given
+        //When
+        //Then
+    }
+}

src/test/java/io/zipcoder/casino/TestWallet.java

 package io.zipcoder.casino;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class TestWallet {
-    public void testAddMethod(){
+
+    @Test
+    public void testAddMoney(){
+        //Given
+        Wallet joeWallet = new Wallet();
+        double expectedMoney = 120.00;
+        //When
+        double actualMoney = joeWallet.addMoney(108.00,12.00);
+        //Then
+        Assert.assertEquals(expectedMoney, actualMoney, 0);
+    }
+
+    @Test
+    public void testTakeMoney(){
         //Given
+        Wallet joeWallet = new Wallet();
+        double expectedMoney = 12.00;
+        //When
+        double actualMoney = joeWallet.takeMoney(24.00,12.00);
+        //Then
+        Assert.assertEquals(expectedMoney, actualMoney, 0);
+    }
 
+    @Test
+    public void testGetMoney(){
+        //Given
+        Wallet joeWallet = new Wallet();
+        double expectedMoney = 12.00;
         //When
+        double actualMoney = joeWallet.getMoney(12.00);
         //Then
+        Assert.assertEquals(expectedMoney, actualMoney, 0);
     }
+
 }

src/test/java/io/zipcoder/casino/playerTest.java

+package io.zipcoder.casino;
+
+import org.junit.Test;
+
+@Test
+
+public class playerTest {
+}

src/test/java/playerTest.java

 
         //Given
         Player xzavia = new Player();
-        Card expected = new Card(Suit.Spade, Rank.Jack);
+        Card expected = new Card(Suit.SPADE, Rank.Jack);
 
         //When
         xzavia.addCard(expected);
     public void getHandTest() {
 
         //Given
-        Card expected = new Card(Suit.Spade, Rank.Jack);
+        Card expected = new Card(Suit.SPADE, Rank.Jack);
         Hand hand = new Hand();
 
         //When
     public void setHandTest() {
 
         //Given
-        Card expected = new Card(Suit.Spade, Rank.Jack);
+        Card expected = new Card(Suit.SPADE, Rank.Jack);
         Hand hand = new Hand();
 
         //When