Merge branch 'gh-pages' of https://github.com/jmayhew/wsp into gh-pages

Conflicts:
	required-content/index.html
c