added new header background image, changed css
fixed merge conflict