a
d

Conflicts:
	css/style.css