Ajustes Locales

UNOS
Merge branch 'Colaboracion_1' of https://github.com/javierbaez/landing_2014 into Colaboracion_1

Conflicts:
	correo_ok.html