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

Conflicts:
	images/playtable.jpg
	index.html