import site
resolve conflicts

Conflicts:
	index.html