more changes to footer.php in clone repository-merge conflict testing
merge conflict resolved
merge conflict resolved
from footer.php.bak to footer.php
changes to footer.php file, pull down from origin/master
more changes in footer.php in clone for testing merge conflicts
merge conflicts resolved