Css linked to right image folder
merge conflict