Integrated City

City’s currently have a thicker border than Settlements.
Merge branch 'master' of https://github.com/Swuu/Settlers-of-Catan-Game

Conflicts:
	HexagonMap.class