Removed redundant city from the test data
Removed/disabled some more of the HLint warnings
Fixed build (removed hlint annotations for now). Fixed nextPlayer
Merge branch 'master' into test32
Enable HLint annotations back, now with explicit 'String' type
Merge branch 'master' into test32
game continues instead of hanging #32