Pequeño cambio en la feature después de mergeada.
html inicial
Merge branch 'feature/primer-cambio-html5' of https://github.com/carmanns/gitdemo into feature/primer-cambio-html5

Conflicts:
	index.html
tres cajas
Merge branch 'feature/primer-cambio-html5' into develop

Conflicts:
	css/estilo.css
	index.html