deleted image files
edited html
resolved conflicts