primer commit
Merge https://github.com/ddsutng8/diseno