Using new site
img

Conflicts:
	index.html
	stylesheets/stylesheet.css
New index