added some notes to game handler and template, as well as a few comments to jqModal
Merge branch 'model' into gameRender
Removed conditional rendering because javascript loves it's immutable difficult to copy objects. So current state was always equal to the old state and nothing ever updated. We have a bug that the cards on the outside seem to be visible for some reason. Click deck then player card to see
Fixed the bug, it had something to do with initEncode's setting the outside cards to be visible, this must have been left in the state on the server. Not really sure why this caused the problem because we only call initEncode via GET request and we use POST for all ajax requests.
Merge pull request #10 from EJEHardenberg/gameRender

Game render
Merge branch 'gameRender' of http://github.com/the-hobbes/softwareEngineeringFinalProject into gameRender
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
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
That error with the array showed up again, and now I'm not sure why
Merge pull request #13 from EJEHardenberg/model

Model
removed simplejson import and replaced it with json, due to upgrade of the app engine
Merge branch 'gameRender' of http://github.com/the-hobbes/softwareEngineeringFinalProject into model
fixed bug 'Uncaught TypeError: Cannot read property '0' of undefined' on line 230 of stateChange.js, by removing extraneous argument