make changes to their and dice to see if blocked
Merge branch 'master' of https://github.com/Swuu/Settlers-of-Catan-Game

Conflicts:
	HexagonMap.class
	NewDice.java
	Thief.java