add state code.
Merge remote-tracking branch 'origin/master'

Conflicts:
	texas-server/src/main/java/server/Game.java