added two images updated css
updated css and resolved merge conflicts