delete scheme and add data-ajax=false, fix tiny bugs in result.html
fix conflicts

Merge branch 'master' of github.com:thetaris/extralife

Conflicts:
	peercheck/www/result.html
	peercheck/www/welcome.html
fix conflicts