added images, css
edited templates
merged conflicts