Cambios en blabla
Union con cambios del merge anterior

Merge branch 'master' of https://github.com/G3rcar/Shapes
Merge del principal

Merge branch 'master' of https://github.com/G3rcar/Shapes