commit
Merge branch 'master' of https://github.com/assasin190/ICECardWars

Conflicts:
	src/main/SetDeck.java