rectangulo master
conflicts solved
Merge branch 'master' of https://github.com/yovasx2/prueba