Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   Client/bin/OnDemandFetcher.class
	modified:   Server/bin/server/Server.class
	modified:   Server/bin/server/ServerStart$1.class
	modified:   Server/bin/server/ServerStart.class
	modified:   Server/bin/server/model/npcs/NPCHandler$1.class
	modified:   Server/bin/server/model/npcs/NPCHandler.class
	modified:   Server/bin/server/model/players/Client$1.class
	modified:   Server/bin/server/model/players/Client.class
	modified:   Server/bin/server/model/players/PlayerSave.class
	modified:   Server/bin/server/model/players/packets/Commands.class
	modified:   Server/bin/server/net/RS2LoginProtocolDecoder$1.class
	modified:   Server/bin/server/net/RS2LoginProtocolDecoder.class
	modified:   Server/compile.bat
	new file:   Server/data/admins.txt
	modified:   Server/data/cfg/spawn-config.cfg
	modified:   Server/data/characters/chins.txt
	modified:   Server/src/server/ServerStart.java
	modified:   Server/src/server/model/npcs/NPCHandler.java
	modified:   Server/src/server/model/players/Client.java
Merge branch 'master' of https://github.com/Half-Shot/yoloscape

Conflicts:
	Client/bin/OnDemandFetcher.class
	Server/bin/server/model/players/Client$1.class
	Server/bin/server/model/players/Client.class
	Server/bin/server/model/players/packets/Commands.class
	Server/data/characters/chins.txt