Added partial failing test for dealing cards
Fixed Player.java merge conflicts
Tested and fixed played config loading. Now passes test