.
...Merge branch 'master' of https://github.com/ronaldiscool/FinalProject

Conflicts:
	bin/GameClient$1.class
	bin/GameClient.class
	bin/GameServer.class
	bin/Reader.class