object_test
Merge branch 'master' of github.com:zfbp/go_juice

Conflicts:
	src/gogame/server.go