Merge branch 'master' of https://github.com/oyachai/HearthSim into oyachai-master

Conflicts:
	src/main/java/com/hearthsim/Game.java
	src/main/java/com/hearthsim/card/Deck.java
Merge branch 'oyachai-master'
Fix groovy tests. This was a stupid mistake on my part... I apparently never ran the groovy tests after a mass copy/paste.