Merge branch 'master' of https://github.com/jgreaser/Reinvention-Single-Player-Debate

Conflicts:
	index.html