Merge branch 'gh-pages' of https://github.com/marcusmichaels/sweat-roulette into gh-pages

Conflicts:
index.html
Merge branch 'gh-pages' of https://github.com/marcusmichaels/sweat-roulette into gh-pages

Conflicts:
	index.html