magic ya dingus
Merge branch 'gh-pages'

Conflicts:
	_includes/header.html