footer y otros
Merge remote-tracking branch 'origin/Ericka' into Jon