MICHAEL IS RESPONSIBLE FOR ALL LIABILITIES
Merge branch 'master' of https://github.com/Swuu/Settlers-of-Catan-Game

Conflicts:
	CatanGame.class
	CatanSetup.class
	Coord.class
	Hexagon.class
	HexagonMap.class