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

Conflicts:
	src/Client.java
	src/Server.java
Creating branch Diogo
Creating branch Diogo
Cagar
Server v1
Merge branch 'teste' into Diogo
correct merge