Maquetacion HTML
Merge branch 'maq_html'