init game-server by pomelo framework of Netease
Merge branch 'feature'

Conflicts:
	README.md
	server/npm-install.sh
Merge branch 'master' of github.com:micfan/wars

Conflicts:
	.gitignore