s
v
Merge branch 'master' of https://github.com/sarah879/neat

Conflicts:
	css/main.css