background
fixed conflicts

Conflicts:
	index.html