ModificarGaleria
Merge branch 'master' of https://github.com/fmontes/PrGalFMontes

Conflicts:
	src/CapaLogica/Gestor.java