Revision con el Profe
Merge remote-tracking branch 'origin/Danny-Araya' into Danny-Araya

Conflicts:
	Doc-SW/Diagramas/DiagramasMetrokilos.vpp