made a change
added a new footer [iss53]
hotfix
finished the new footer
Merge branch 'iss53'
test conflict
test conflict
merge testing