look & feel
	new file:   InterfazServidor/JTattoo.jar
Merge branch 'master' into HEAD

Conflicts:
	InterfazServidor/build/built-jar.properties
	InterfazServidor/build/classes/conexion/ConnectionManager.class
	InterfazServidor/build/classes/conexion/SocketServidor$Cliente$1.class
	InterfazServidor/build/classes/conexion/SocketServidor.class
	InterfazServidor/build/classes/main/Main$1.class
	InterfazServidor/build/classes/main/Main.class
	InterfazServidor/build/classes/modelos/ListaCanciones.class
	InterfazServidor/fich_selector
	InterfazServidor/nbproject/project.properties

	modified:   InterfazServidor/build/built-jar.properties
	modified:   InterfazServidor/fich_selector
	modified:   InterfazServidor/nbproject/project.properties