added background image to index page
fixed merge conflicts