s
conflict

Conflicts:
	css/stylesheet.css