added footer
removed footer, wrong branch
added footer
Merge branch 'master' into add-footer