Revert "cambios clase 1"

This reverts commit 2c6d1ba93b20c579180ae31adde618b8eb6d8963.
Revert "Revert "cambios clase 1""

This reverts commit 0048c63b582e604bf9547f0b385fd2b34caa4bd1.
Merge remote-tracking branch 'origin/master'