Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/ingrid-cespedes/vergel
Merge branch 'develop'
Revert d77f6a9..78ad02a

This rolls back to commit d77f6a9b2c6903c894a0fb1c78f432d170029f8b.
Merge branch 'develop'

Conflicts:
	css/vergel.css
	less/extras.less
	maquetas/index.html
Merge branch 'develop'

Conflicts:
	css/vergel.css
Versión online
scale
se borraron imágenes de antiguos logos
twitter
cabecera fixed & footer menu
ajustes para el release
Merge branch 'master' into develop con el nuevo release v.0.1.0