Merge branch 'master' of https://github.com/tianfan/hostynasty

Conflicts:
	server.js
Merge branch 'master' of https://github.com/tianfan/hostynasty

Conflicts:
	server.js