index and style.css changes
changing style.css

Conflicts:
	css/style.css