merged my brach with feat/dev branch

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

@@ -6,6 +6,7 @@ import org.junit.Test;
 import java.security.PublicKey;
 
 public class TestPlayer {
+<<<<<<< HEAD
 
     @Test
     public void testGetBet() {
@@ -53,5 +54,9 @@ public class TestPlayer {
 
 
 
+=======
+   // @Test
+  //  public void
+>>>>>>> feat/Wallet_Player_BlackjackPlayer
 }