new file:   InterfazServidor/01 Love Lost.mp3
	deleted:    InterfazServidor/prueba1.mp3
	modified:   InterfazServidor/test/modelos/ListasCancionesManagerTest.java
	modified:   InterfazServidor/test/reproductor/PlayerReproductorTest.java
Merge branch 'master' of https://github.com/djin/socialDj