Update
Update
Merge branch 'master' of https://github.com/cheche338/Proyecto

Conflicts:
	GuiaGIT.txt
Update
Update Test
Update GuiaGIT.txt