humanity/humanity — pull request #22 by jack-t (2014-04-30 12:48:06+00:00)
Title: Game impl

How do you manually merge branches? It's mostly the new JSON stuff that has to be merged, I think.