Ejemplo Para Jack
123
Merge branch 'master' of https://github.com/emiliano8511/dsi

Conflicts:
	backend/corregir.php
	backend/cotizar.php
	interface/html/index.html