changing stuff to defense
Merge remote-tracking branch 'origin/teste' into remoteBranch

Conflicts:
	src/Client.java
	src/RmiServer.java