Final working commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	13CardGame/bin/CardFrame.class
	13CardGame/bin/MainClass$1.class
	13CardGame/bin/MainClass.class
	13CardGame/src/CardPanel.java