game loop works
preparing to pull
resolved merge conflicts
Merge branch 'master' of https://github.com/fsteen/monopoly-for-the-gods
Settings object passed as arg, serializable