Reduced logo size for desktop
Reduced logo size for desktop
Adding new footer html markup
Adding conflicted files