Merge pull request #12 from EduardoDuran/diseno

cambios lampara
arreglo de detalles
Merge pull request #13 from EduardoDuran/logica

arreglo de detalles
linear layout