Revert "Revert "Merge branch 'master' of https://github.com/SeminarioInvestigacion/SeminarioInvestigacion""

This reverts commit f66c793e663ebaf01e7b5d3a794ea977ddea23bb.