Merge pull request #14 from EJEHardenberg/model

Model
added swap card instructions to the message field of the json array. also added logic to reset this message.
added logic to the playerstate, when the player has drawn a draw2 card, to make the player's cards inactive. This will prevent the player from clicking on them and entering a draw2 loop.
Merge pull request #1 from the-hobbes/model

Merge Model from mainline. Swap 2 handler changes