Merge branch 'master' of https://github.com/fatevil/Black-Jack

Conflicts:
	src/Deck/Card.java
	src/Deck/Deck.java
	src/Deck/Suit.java
	src/Game/Game.java
	src/Game/Player.java
	src/Main.java