footer
adicion footer
Merge branch 'stephys'
merge conflicts fixed