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

Conflicts:
	css/vergel.css
iniciar seción
cambios de ing
arreglo vergel css
Agregados links
Merge branch 'master' into develop
gasd
Links y formulario

falta cambiar titulo de formulario
links
galeria
asdf
Merge branch 'develop'