Gankro/Jterniabound — pull request #61 by LtSquigs (2012-09-05 01:56:29+00:00)
Title: Manual Merge of #43

I didn't know how to do the fancy manual merge stuff, so I just rewrote it in there. I also fixed a bug in the parsing of the new game state stuff.