djdjd
Merge branch 'master' of https://github.com/brainteam/BrainSphere.git
New Branch for smoothing out the server stuff without getting messed
with by all the JMonkey.
Merge branch 'master' of https://github.com/brainteam/BrainSphere.git
Just an update
dadada
Fixing commits.
Updates to server just trying to periodically commit.
Finished work for tonight
Finished work for tonight
Merge branch 'ChrisServerSmoothing' of https://github.com/brainteam/BrainSphere.git into ChrisServerSmoothing
several changes in smoothing the server and trying to get basic chatting
system in place
Forgot to add a couple things to the index
Committing much stuff.
Merge remote-tracking branch 'origin/ChrisServerSmoothing'

Conflicts:
	BrainSphere/src/brainteam/server/GameMatrix.java
	BrainSphere/src/brainteam/server/Server.java
Merge branch 'master' of https://github.com/brainteam/BrainSphere.git