no message
Merge branch 'master' of https://github.com/reedcwilson/catan

Conflicts:
	src/com/catan/main/server/Server.java
Merge branch 'master' of https://github.com/reedcwilson/catan
Fixed mapAppearance