Changes to be committed:
	modified:   Server/bin/server/model/players/Client.class
	modified:   Server/src/server/model/players/Client.java
 Changes not staged for commit:
	modified:   Client/compile.sh
	modified:   Client/prices.txt
	modified:   Client/run.sh
	modified:   Server/bin/server/ServerStart$1.class
	modified:   Server/bin/server/ServerStart.class
	modified:   Server/bin/server/model/players/ActionHandler.class
	modified:   Server/bin/server/model/players/Client$1.class
	modified:   Server/bin/server/model/players/PlayerSave.class
	modified:   Server/bin/server/model/players/PlayerSaving.class
	modified:   Server/bin/server/net/RS2LoginProtocolDecoder.class
	modified:   Server/bin/server/task/TaskFactory$1.class
	modified:   Server/bin/server/task/TaskFactory$2.class
	modified:   Server/bin/server/task/TaskFactory$3.class
	modified:   Server/bin/server/task/TaskFactory$Task.class
	modified:   Server/bin/server/task/TaskFactory.class
	modified:   Server/bin/server/util/ShutDownHook.class
	modified:   Server/bin/server/world/ObjectHandler.class
	modified:   Server/bin/server/yolo/Logger.class
	modified:   Server/compile.sh
	modified:   Server/data/characters/chins.txt
	modified:   Server/run.sh
	modified:   Server/runCommandLine.sh
	modified:   Server/src/server/model/players/ActionHandler.java
	modified:   Server/src/server/model/players/PlayerSave.java
	modified:   Server/src/server/net/RS2LoginProtocolDecoder.java
	modified:   Server/src/server/world/ObjectHandler.java
	modified:   Server/src/server/yolo/Logger.java
Forgot a file, git does not forget, never forgives.
Merge branch 'master' of https://github.com/Half-Shot/yoloscape

Conflicts:
	Server/bin/server/model/players/Client.class
	Server/bin/server/model/players/PlayerSave.class