n
ss
Merge branch 'master' of https://github.com/shaker89/blackjack

Conflicts:
	BlackJack/src/Controller/Controler.java
	BlackJack/src/model/Player.java