qgfdg
Merge branch 'master' of https://github.com/jrferrera/cmsc137-project

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