style.css

Conflicts:
	SiteCore4/css/style.css