footer
adicion footer
Merge branch 'stephys'
merge conflicts fixed
fixing merge oscar
merge with oscar conflicts fixed