added if to maritime startTrade
Merge branch 'master' of https://github.com/abe-austin/Catan
jars
Conflicts:
	java/dist/catan-client.jar
	java/dist/catan-server.jar