:
Merge branch 'master' of https://github.com/xpush/stalk.io-server

Conflicts:
	server.js