style
Merge remote-tracking branch 'origin/master' into malli

Conflicts:
	html/css/style.css
footer y logos
Merge branch 'master' into malli
footer
cambios
cambios