modified:   InterfazServidor/build/classes/conexion/ConnectionManager.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/ListaCanciones.class
	modified:   InterfazServidor/fich_selector
	modified:   InterfazServidor/src/elementosInterfaz/PanelCaratula.java
	modified:   InterfazServidor/src/elementosInterfaz/PanelInicial.java
	modified:   InterfazServidor/src/elementosInterfaz/PanelLogo.java
	modified:   InterfazServidor/src/elementosInterfaz/PanelPestana.java
	modified:   InterfazServidor/src/elementosInterfaz/Tabla.java
	modified:   InterfazServidor/src/main/Main.java
	modified:   InterfazServidor/src/reproductor/PlayerReproductor.java
Merge branch 'master' of https://github.com/djin/socialDj