domestic trade
Merge branch 'master' of https://github.com/abe-austin/Catan
Conflicts caused by compilation
Conflicts:
	java/dist/catan-client.jar
	java/dist/catan-server.jar
committing for the zip