commit
Merge branch 'master' of https://github.com/vicanso/jtstats

Conflicts:
	lib/server.js