block off city
merge conflict
fixes
Merge branch 'master' of https://github.com/jianshentan/cs032_game