Cambio nuevo
Merge branch 'master' of https://github.com/m92moalj/Grupo_IS

Conflicts:
	README.md
Merge branch 'master' of https://github.com/m92moalj/Grupo_IS

Conflicts:
	README.md