Cambios

Arreglos de footer, agregados hover naranjos, se agregan textos de
ejemplo, se modifican textos de noticias a P, se modifican ciertos
botones.
Merge branch 'master' into develop

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

Conflicts:
	css/vergel.css
	less/extras.less
Revert d77f6a9..116cdbf

This rolls back to commit d77f6a9b2c6903c894a0fb1c78f432d170029f8b.
Merge branch 'develop'
hice un roll back

Cambio en el color de los botones
text decoration none
Letras de Footer arregladas
asd
Revert d77f6a9..78ad02a

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

Conflicts:
	css/vergel.css
	less/extras.less
	maquetas/index.html