Player Object, Gamestate work, constants

Added player object definition and methods. Gamestate work, and added
global constants object
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.js