example of pull and push
test commit
Merge branch 'model' of https://github.com/the-hobbes/softwareEngineeringFinalProject into model
another test change and push
fixed internal server error due to a misnamed dictionary key on lines 204-213. All set now.
finished code for handling the draw2 state. note, that we are now simply passing the playerChoice state back to the view in this case, as regardless of choice, the player will get to play another card.
fixing merge conflicts