Merge pull request #4 from jamarin6/rama1

prueba cambio footer
Merge pull request #5 from jamarin6/rama1

prueba2 footer con amarillo
Merge remote-tracking branch 'upstream/master'