added initEncode method to game.py handler so that an initial state is encoded and passed to the javascript model. TODO: the json object is htmlescaped twice, so i must find a way around that
fixed merge conflict in game.html between ethan and my versions
added animation to the player's cards on initial state to show the player their cards in a nice fancy way. Need to work on delaying transition between states. Need to work on renderState as well for the case where old and new state are defined
Did a bit of cleanup, and now debating about whether or not its neccesary to have an old vs newstate, I suppose I'm wondering if we'll gain much runtime from it. Something to think about over night
Fixed timing of the javascript initial states
Merge pull request #7 from EJEHardenberg/gameRender

Game render
fixed encoding problem by applying autoescaping in jinja to only the templates that actually need it (ie playerinfo)
made the scores in game template pop up in a new window
removed some extra commenting
added an import to the yaml file to fix a console logging error, changed game to begin incorporating the ajax handling, added some test ajax to the template file
minor change to game handler
fixed the error 500 issue- the test json in the code wasn't actually valid json, so it was unable to be processed by json.dumps. I am now passing valid json in and out, looks ok. Next will add some real functionality
ok, added the current state as the data parameter in the ajax request (had to call stringify on it first). looks like it is working. will add the actual handlers for at least one state tomorrow
fixed issue with rendering (render call wasn't getting executed because it was in the test function
Added a small bit of testing to game.py to test ajax responses from javascript, adding in ajax requests
temp
merging proper JSON on the python side with ajax in javascript
Removed test code and fixed javascript ajax posting
Merge branch 'model' into gameRender
Interesting click stacking is going on. commiting so phelan can pull and debug it with me