Chat messages match color of the player
Merge branch 'dev' of ssh://git@github.com/CSc436/Project-4x.git into
dev

Conflicts:
	src/com/server/SimpleSimulatorImpl.java