version 1

src/CardGame.java

@@ -1,4 +1,8 @@
 import java.util.ArrayList;
+import java.util.Random;
+
+import static java.util.Collections.shuffle;
+//import org-apache-commons-lang3.ArrayUtils;
 
 public class CardGame {
     public Player[] players;
@@ -11,7 +15,7 @@ public class CardGame {
      */
     public CardGame(int numberOfCards, int numberOfPlayers) {
         Pile deck = createDeck(numberOfCards);
-        deck.shuffle();
+        shuffle(deck, new Random());
         this.players = new Player[numberOfPlayers];
         draws = new Card[numberOfPlayers];
         int deckCount = deck.count();
@@ -65,6 +69,7 @@ public class CardGame {
         }
         System.out.printf("Player %d wins this round\n\n", maxIndex);
         players[maxIndex].discardPile.addAll(pot);
+        pot.clear();
     }
 
     private boolean noWinner() {

src/Pile.java

@@ -7,9 +7,9 @@ public class Pile extends ArrayList<Card> {
 //        return pile.isEmpty();
 //    }
 //
-    public void shuffle() {
+//    public void shuffle() {
-    }
+//    }
-
+//
     public void takeDiscarded() {
     }
 

src/Player.java

@@ -1,3 +1,7 @@
+import java.util.Random;
+
+import static java.util.Collections.shuffle;
+
 public class Player {
     String name;
     Pile drawPile;
@@ -30,12 +34,16 @@ public class Player {
             if (getDiscardPile().isEmpty()) {
                 throw new NoMoreCardsException();
             }
-            discardPile.shuffle();
+            shuffle(discardPile, new Random());
-            drawPile.takeDiscarded();
+            drawPile.addAll(discardPile);
+            discardPile.clear();
+        }
+        if (drawPile.count() > 0) {
+            Card draw = drawPile.get(0);
+            drawPile.remove(0);
+            return draw;
         }
-        Card draw = drawPile.get(0);
+        return null;
-        drawPile.remove(0);
-        return draw;
     }
 
     public boolean broke() {