fixed merge conflict

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

@@ -0,0 +1,47 @@
+package io.zipcoder.casino;
+
+public class Card {
+
+    private Suit suit;
+    private Rank rank;
+    private int x;
+
+
+    public Card(Suit suit, Rank rank) {
+        this.suit = suit;
+        this.rank = rank;
+        x = 0;
+    }
+
+    public Rank getRank() {
+        return rank;
+    }
+
+    public Suit getSuit() {
+        return suit;
+    }
+
+    public void setRank(Rank rank) {
+        this.rank = rank;
+    }
+
+    public void setSuit(Suit suit) {
+        this.suit = suit;
+    }
+
+    @Override
+    public String toString() {
+        String describe = "";
+        int x = 5;
+        if (suit.equals(Suit.SPADES)) {
+            describe = rank + "\u2660 of " + suit + "\n";
+        } else if (suit.equals(Suit.CLUBS)) {
+            describe = rank + "\u2663 of " + suit + "\n";
+        } else if (suit.equals(Suit.DIAMONDS)) {
+            describe = rank + "\u2666 of " + suit + "\n";
+        } else if (suit.equals(Suit.HEARTS)) {
+            describe = rank + "\u2665 of " + suit + "\n";
+        }
+        return describe + x;
+    }
+}

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

@@ -0,0 +1,44 @@
+package io.zipcoder.casino;
+import java.util.Collections;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Random;
+
+public class CardDeck {
+
+    private Card card;
+    private List<Card> deck = new ArrayList<Card>(52);
+    private Random rand = new Random();
+
+    public CardDeck() {
+
+        for (Suit s : Suit.values()) {
+            for (Rank r : Rank.values()) {
+                deck.add(new Card(s, r));
+            }
+        }
+    }
+
+    public List<Card> getDeck() {
+        System.out.println(deck.toString());
+        return deck;
+    }
+
+    public void shuffle() {
+        Collections.shuffle(deck, rand);
+    }
+
+    public void deal(int numOfCards) {
+        Collections.shuffle(deck, rand);
+        for (int i = 0; i < numOfCards; i++) {
+            System.out.println(deck.remove(0));
+        }
+    }
+
+    public Card draw() {
+        if (deck.isEmpty()) {
+            new CardDeck();
+        }
+        return deck.remove(0);
+    }
+}

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

@@ -0,0 +1,45 @@
+package io.zipcoder.casino;
+
+public abstract class CardGame implements Game, Gamble {
+
+//    int playerHand;
+//    int dealerHand;
+//    int currentBet;
+//    Player player;
+//    CardDeck deck;
+//
+//    public CardGame(Player player) {
+//
+//        this.player = player;
+//        this.deck = new deck();
+//
+//    }
+//
+//
+//    public int drawCard() {
+//
+//
+//    }
+//
+//    public void stand() {
+//
+//    }
+//
+//    void startGame();
+//
+//    void endGame();
+//
+//    void declareWinner();
+//
+//    void bet(int currentBet) {
+//
+//    }
+//    void winBet() {
+//
+//    }
+//    void loseBet(Player player) {
+
+    }
+
+
+

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

@@ -2,4 +2,38 @@ package io.zipcoder.casino;
 
 
 public class Casino {
+
+    private Player player;
+    private String choice;
+    private Console console;
+    //GameFactory gf;
+
+    public void startCasino() {
+        do {
+            System.out.println("Welcome to the Zip Code Casino!");
+            System.out.println("Which game would you like to play? ");
+            System.out.println("1: BlackJack");
+            System.out.println("2: Baccarat");
+            choice = Console.askForInput("3: Craps");
+            System.out.println(choice);
+
+            if (choice.equalsIgnoreCase("1")) {
+
+            }
+        } while (false);
+
+        }
+ //   }
+
+    public static void main(String[] args) {
+
+        CardDeck cardDeck = new CardDeck();
+        cardDeck.getDeck();
+        cardDeck.shuffle();
+        cardDeck.getDeck();
+        System.out.println(cardDeck.draw());
+        cardDeck.deal(2);
+        Casino cas = new Casino();
+        cas.startCasino();
+    }
 }

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

@@ -1,15 +1,9 @@
 package io.zipcoder.casino;
 
 public interface Gamble {
-
-
-
      int currentBet = 0;
      void bet(int bet);
      void winBet(int currentBet);
      void loseBet(int currentBet);
-
-
-
-
+     
 }

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

@@ -2,7 +2,7 @@ package io.zipcoder.casino;
 
 public interface Game {
    // variable of Player type
-    Player player;
+   // Player player;
 
     void startGame();
 

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

@@ -1,11 +1,11 @@
 package io.zipcoder.casino;
 
 public class Main {
-    public static void main(String[] args){
-        Casino casino =  new Casino();
-        casino.start();
+//    public static void main(String[] args){
+//        Casino casino =  new Casino();
+//        casino.start();
 
-    }
+//    }
 
 
 }

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

@@ -0,0 +1,43 @@
+package io.zipcoder.casino;
+
+public class Player {
+
+    private String name;
+    private int bankroll;
+    private int score;
+
+    public Player(String name) {
+        this.name = name;
+        bankroll = 1000;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getBankroll() {
+        return bankroll;
+    }
+
+    public void addToBankroll(int winnings) {
+        bankroll += winnings;
+    }
+
+    public void subtractFromBankroll(int losings) {
+        bankroll -= losings;
+    }
+
+    public void setScore(int value) {
+        score += value;
+    }
+
+    public int getScore() {
+        return score;
+    }
+
+
+}

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

@@ -0,0 +1,7 @@
+package io.zipcoder.casino;
+
+public enum Rank {
+
+    TWO, THREE, FOUR, FIVE, SIX, SEVEN,
+    EIGHT, NINE, TEN, JACK, QUEEN, KING, ACE;
+}

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

@@ -0,0 +1,6 @@
+package io.zipcoder.casino;
+
+public enum Suit {
+
+    SPADES, HEARTS, DIAMONDS, CLUBS;
+}