Escan histórico terminado
Merge branch 'master' of https://github.com/lishzenzeyul/eslabon

Conflicts:
	unidad-2.md