Merge branch 'gameRender' of http://github.com/the-hobbes/softwareEngineeringFinalProject into gameRender
fixed internal server error due to a misnamed dictionary key on lines 204-213. All set now.
Merge branch 'gameRender' of http://github.com/the-hobbes/softwareEngineeringFinalProject into gameRender
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
Merge branch 'gameRender' into model
Fixed array in image bug. The problem was due to our appending of subDeck to deck, this does not flatten the list and merge the two, it simply places the list into the other list. This is a pitfall of dynamically typed lists, letting everything leads to unpredicatable behavior and issues like this. This would be a very difficult situation to create in C or a strongly typed language
Removed debug logging code
Added shuffling the deck after putting in power cards, and refactored returns to reduce redundancy
Merge pull request #13 from EJEHardenberg/model

Model