cambios al server
Merge branch 'master' into serverstuff

Conflicts:
	build/classes/datosInternos/Sala.class
	build/classes/interfaz/DiSala$3.class
	build/classes/interfaz/DiSala.class
	build/classes/interfaz/FRCliente.class
	build/classes/servidor/Servidor$1.class
	build/classes/servidor/Servidor.class
	nbproject/private/private.properties
	src/datosInternos/Sala.java
merging from TheMemoman
beatiful changes
beatiful changes
beatiful changes
beatiful changes
beatiful changes
beatiful changes
more beatiful changes
more beatiful changes