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
Merge branch 'master' of https://github.com/djin/socialDj

Conflicts:
	InterfazServidor/build/classes/main/Main$1.class
	InterfazServidor/build/classes/main/Main.class
	InterfazServidor/fich_selector

	modified:   InterfazServidor/fich_selector