Add client and server file
Merge branch 'master' of github.com:beckbaibai/pvt

Conflicts:
	server/game.server.js