proper object identification and new town hall (temporary)
Merge branch 'master' of https://github.com/Sloth6/Colludo