Merge pull request #6 from EJEHardenberg/gameRender

Game render
fixed indentation error
minor changes to game.py
Merge branch 'gameRender' of http://github.com/the-hobbes/softwareEngineeringFinalProject into gameRender
committing work on game.py, specifically waitingForPcard handler
Merge branch 'model' of https://github.com/pmleblanc/softwareEngineeringFinalProject into model
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.
Have HAL just give control to the player in the HAL state handler
Merge branch 'model' into gameRender
began working on trying to get HAL to just be a dummy and switch the state back to the user
Merge pull request #11 from EJEHardenberg/gameRender

Game render
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