added functionality for cities and settlements
Merge branch 'master' of https://github.com/Databean/warsofcatan into settlements_and_cities
added robber functionality, and fixed some broken road tests
Fixed crash
added robber, changed resources to be a map of resourcetiles
Merge pull request #10 from Databean/settlements_and_cities

Settlements and cities