user auth
Merge branch 'master' of https://github.com/Xuefeng-Zhu/speedtest_heroku into devep
add hello world page
Merge branch 'devep' of https://github.com/Xuefeng-Zhu/speedtest_heroku

Conflicts:
	node_modules/firebase-token-generator/package.json
	node_modules/firebase/node_modules/faye-websocket/node_modules/websocket-driver/package.json
	node_modules/firebase/node_modules/faye-websocket/package.json
	node_modules/firebase/package.json
	web.js