pst
	modified:   InterfazServidor/nbproject/project.properties
Merge branch 'master' into HEAD

Conflicts:
	InterfazServidor/build/classes/conexion/ConnectionManager.class
	InterfazServidor/build/classes/conexion/SocketServidor$Cliente$1.class
	InterfazServidor/build/classes/conexion/SocketServidor.class
	InterfazServidor/build/classes/main/Main.class