Merging stuff. (writing tests.....)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Poker/poker/GameImpl.java