fixes
fixes
fixes
Merge branch 'master' of https://github.com/LMZTeam/laboratorio_arquitectura

Conflicts:
	git_manual.txt