asd

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