reset
fhchc
fhchc
Merge remote-tracking branch 'origin/teste' into Ricardo1

Conflicts:
	src/Client.java
	src/Server.java