secundary server becoming main server ok!!
Merge remote-tracking branch 'origin/teste' into remoteBranch

Conflicts:
	src/Client.java