Merge pull request #1 from rafaelaznar/master

Añadir grupo04
Merge pull request #19 from JGrancha/master

merge de grupo04