elementos de portada
Merge remote-tracking branch 'origin/master'

Conflicts:
	foundation/css/style.css
	foundation/index.html