testing
...
Merge branch 'master' of https://github.com/Swuu/Settlers-of-Catan-Game

Conflicts:
	Thief.java
...