slider
Merge branch 'natashaagain'

Conflicts:
	style.css