Incorporating version two of site
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_includes/header.html
	index.html