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

Conflicts:
	src/Client.java
	src/Server.java
fhchc
Merge remote-tracking branch 'origin/teste' into Ricardo1

Conflicts:
	src/Client.java
	src/Server.java
Merge branch 'teste' into Diogo
correct merge
correct merge
Client Server simple connection OK!!
fhchc
fhchc
Merge remote-tracking branch 'origin/teste' into Ricardo1
teste
corect port
//TODOS's
multiple clients
secundary server becoming main server ok!!