Merge branch 'develop'
Merge branch 'develop'
codigos header
Merge branch 'develop' of https://github.com/ingrid-cespedes/vergel into develop

Conflicts:
	css/vergel.css
Merge branch 'master' into develop
margen superior
Alineado botones y títulos
detalles
Merge branch 'develop' of https://github.com/ingrid-cespedes/vergel into develop

Conflicts:
	css/vergel.css
	less/extras.less
borre logos
arreglos