css work
Edits

Conflicts:
	css/main.css
	images/logo.png