Fixing even more of CJ's bugs
Merge branch 'master' of github.com:Rhionin/catan-text-persistence