Changes

Comments and other smallthings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GameClient.java
	src/GameServer.java
	src/UserMessenger.java
Merge branch 'master' of https://github.com/ronaldiscool/FinalProject

Conflicts:
	bin/GameServer.class
	src/GameServer.java