modified:   InterfazServidor/build/classes/main/Main$1.class
	modified:   InterfazServidor/build/classes/main/Main.class
	modified:   InterfazServidor/fich_selector
	modified:   InterfazServidor/src/elementosInterfaz/ReproductorPanel.java
	modified:   InterfazServidor/src/main/Main.java
Merge branch 'master' of https://github.com/djin/socialDj

Conflicts:
	InterfazServidor/fich_selector

	modified:   InterfazLista/gen/R.java.d
	modified:   InterfazServidor/fich_selector