Server and Clients working
Merge branch 'master' of https://github.com/acvilarim/CaribbeanKrack

Conflicts:
	src/com/ocean/Server.java
	test.ser