added some useful methods to player, a toString to Card, and some AI card playing
fixed merges