hola
Merge branch 'master' of
ssh://git@github.com/labellson/ProyectoIsoft.git

Conflicts:
	isoft/src/Artista.java