Adding borders to folio and teaser thumbnails
Inserting better backup font when "Oswald" is not available
Indenting

Conflicts:
	_includes/header.html