Merge pull request #12 from hugovom/gh-pages

agrega mejoras a la maqueta, elimina error en css y footer
Updates ConMapas event description
Actualiza descripción de ConMapas
"descargar" en lugar de "bajar"
Add location, speakers and map to event.
Make a note on speakers tbc.
Merge pull request #14 from hugovom/gh-pages

agrega mejoras a responsive
Merge pull request #13 from lxbarth/gh-pages

Add location, speakers and map to event to conmapas (spanish)
Add link to lightning-talks registration
Arregla el español de conmapas
Agrega info de la sede
Adding speakers and venue info to ConMapas (ENG version)
Merge pull request #15 from mxabierto/lightning-talks

Add link to lightning-talks registration
Y U NO USE REAL MAPBOTZ
Merge pull request #17 from mxabierto/embed-a-map

Y U NO USE REAL MAPBOTZ
Speakers to be confirmed
Ponentes por confirmar
Cambios en Logos
Merge pull request #18 from mxabierto/programa

Cambios en Logos
iguala logos esp/ing