using SSL so that permissions will be kept between plays
Merge branch 'master' of https://github.com/wilbefast/riddler-sphix-html5

Conflicts:
	server.js
format code in index