Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_layouts/default.html
	index.md
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html