deleted:    AndroidApplication1/local.properties
	deleted:    InterfazServidor/build/built-jar.properties
	modified:   InterfazServidor/build/classes/conexion/ConnectionManager.class
	modified:   InterfazServidor/build/classes/conexion/ServerSocketListener.class
	modified:   InterfazServidor/build/classes/conexion/SocketServidor$1.class
	modified:   InterfazServidor/build/classes/conexion/SocketServidor$Cliente$1.class
	modified:   InterfazServidor/build/classes/conexion/SocketServidor$Cliente.class
	modified:   InterfazServidor/build/classes/conexion/SocketServidor.class
	modified:   InterfazServidor/build/classes/main/Main$1.class
	modified:   InterfazServidor/build/classes/main/Main.class
	modified:   InterfazServidor/build/classes/modelos/Cancion.class
	modified:   InterfazServidor/build/classes/modelos/ListaCanciones.class
	modified:   InterfazServidor/nbproject/project.properties
arreglando conflictos de merge