Testing type margins
Merge branch 'gh-pages'

Conflicts:
	index.html
	site/style.min.css
Note about type margins
Updating rendered CSS