estructura 3
detalle
Merge remote-tracking branch 'origin' into luis

Conflicts:
	app/views/layouts/navbar.html.haml
detalles
frontend home
Nosotros inicio
Nosotros 2
Agregado frontend category