Layout & Styling
Merge branch 'master' of https://github.com/Automattic/sulfur

Conflicts:
	index.html