fixed small issue where playerChoice wasn't resetting the active card value
fixed merge conflicts with comments in game.py, draw2playerchoice