Added new header logo
fixed merge conflicts