fixed urls and added sticky footer
resolfing conflicts