continuação cliente salas
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
	src/visao/ClienteVisao.java
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 92f554b994154f99744267172a0fd39479f2dbba.
servidor disciplina e clientes salas teste
cliente salas
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/visao/ClienteVisao.java

Merge remote-tracking branch
'origin/master'

Conflicts:
	src/visao/ClienteVisao.java
mais cliente salas
Merge remote-tracking branch 'origin/master'