gh-pages
Merge branch 'maybe_detached' into gh-pages

Conflicts:
	master/index.html