tres
otro 2
Merge branch 'master' of https://github.com/Leidgam/Imprenta.git

Conflicts:
	AllProyect/impr/WebContent/ac.jsp