sync
m

Conflicts:
	css/style.css