Merge pull request #31 from Nicomagg/develop

fixes #8 E4T4FE1 - Diseño/Maquetado
fixes #10 - E4T9FE1
fixes #10 - E4T9FE1
fixes #30 E4T10bBE2 - Campo - Hora
Merge pull request #33 from yukitogithub/develop

E4T10bBE2 - Campo - Hora
fixes #34 - E4T10dBE1 - Listado de noticias y eventos
Merge pull request #35 from yukitogithub/develop

E4T10dBE1 - Listado de noticias y eventos
fixes #7 - E4T3FE1 - Slider/Espacios en blanco
Merge pull request #36 from agustin107/develop

fixes #7 - E4T3FE1 - Slider/Espacios en blanco
fixes #10 - E4T9FE1
fixes #10 - E4T9FE1
Merge pull request #38 from C04CH/develop

fixes #10 - E4T9FE1
Bugs - Correciones Generales y Resolución de tarea E4T10cFE1
Merge pull request #39 from yukitogithub/develop

E4T10cFE1 - Bugs - Resolución de tarea y Correciones Generales
Commit prueba
Revert "Commit prueba"
Mala mia
This reverts commit e10a39f6baa72df4f7800adbc05daddfb46bd6e9.
Revert "Revert "Commit prueba""

This reverts commit cca2c8160aa6c99715a61f13c338b5d9ab726475.

Revert "Revert "Commit prueba""

This reverts commit cca2c8160aa6c99715a61f13c338b5d9ab726475.
Merge remote-tracking branch 'upstream/develop' into develop
fixed #41 - Diseño/Maquetado - Implementación