estilos
Merge branch 'front' of https://github.com/eclass/kiosko into front

Conflicts:
	css/estilo.css
	lleno.html