test
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/index.js
	test/speedtest.js
	test/spideronredis.js