fixes
fixes
fixes
Merge branch 'master' of https://github.com/brudi07/Card.git

Conflicts:
	src/main/Main.java
	src/player/Player.java