Coloque los layaouts
Merge branch 'master' of https://github.com/catoror/TrabajoBases2.git
Merge branch 'master' of https://github.com/catoror/TrabajoBases2.git
Merge branch 'master' of https://github.com/catoror/TrabajoBases2.git