background image on homepage, changed background color and hyperlinks are white
updates to merge conflicts