Add in a footer
Merge origin/master and fix conflicts
Fix broken link to image, add correct classes to topnav html content