merge conflict resolved

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

@@ -1,5 +1,7 @@
 package io.zipcoder.casino;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.HashMap;
 
 public abstract class CardGame {
@@ -9,6 +11,7 @@ public abstract class CardGame {
     private int handSize;
     private Player playersTurn;
     private Player[] players;
+    private ArrayList<Card> deck = new ArrayList<>();
 
 
     CardGame(int minBet, int maxBet){
@@ -21,6 +24,8 @@ public abstract class CardGame {
 
     public void Shuffle(){
 
+        //shuffle the card stack
+
     }
 
     public void faceDown(Card card){
@@ -30,4 +35,8 @@ public abstract class CardGame {
     public void faceUp(Card card){
         card.setVisibility(true);
     }
+
+    public ArrayList<Card> getDeck() {
+        return deck;
+    }
 }

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

@@ -2,14 +2,21 @@ package io.zipcoder.casino;
 
 public class Console {
     private Game[] games;
+    private Player player;
 
     Console(){}
 
-    public void createAccount(){
-
+    public void createAccount()
+    {
+        /*
+            ask the player for their name.
+            ask the player for their starting balance
+            create the player.
+         */
     }
 
-    public void chooseGame(String gameName){
+    public void chooseGame(String gameName)
+    {
         /*
             ask the user for min max bet at the table
             ask the user which game they would like to play

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

@@ -2,13 +2,18 @@ package io.zipcoder.casino;
 
 public class Dice {
 
+
     private int value;
 
     public void roll(){
 
         value = (int) (Math.random()*6+1);
 
+        //Generate a random number between 1 and 6
+        //set value equal to this number
+
     }
+
     public int getValue()
     {
         return value;

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

@@ -6,4 +6,8 @@ public class DicePlayer {
     private Player player;
     Dice[] cup = new Dice[5];
     ScoreSheet scoreSheet = new ScoreSheet();
+
+    public DicePlayer(Player player){
+        this.player = player;
+    }
 }

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

@@ -11,9 +11,6 @@ public class War extends CardGame implements Gamble, Game {
         super(minBet, maxBet);
     }
 
-    public void Deal() {
-
-    }
 
     /**
      * Specific to war methods
@@ -60,4 +57,13 @@ public class War extends CardGame implements Gamble, Game {
     public void StartRound() {
 
     }
+
+    public void Deal() {
+
+        /*
+            for every player playing this game (i)
+                for every card in the deck (j)
+
+         */
+    }
 }