Merge pull request #2 from Half-Shot/master

Updating to latest version
Merge pull request #9 from ProLegacy323/master

Updates and Tings 3
Added a comment and a README.md
Merge pull request #17 from Figglewatts/master

Added a README.md to Client root folder
Added new command ::teleportme
Lots more sutff being logged to console.
File logging fixed.

TODO:
* Replace playerRights (int) with isAdmin
* Doors rotations
Merge branch 'master' of https://github.com/Half-Shot/yoloscape

Conflicts:
	Client/bin/client.class
Black screen fix & other half finished additions

Ta-dah!
Merge branch 'master' of github.com:Half-Shot/yoloscape

Conflicts:
	Client/bin/client.class
	Server/bin/server/Server.class
	Server/bin/server/model/players/packets/Commands.class
	Server/data/characters/chins.txt
Updated .gitignore to ignore .class files

They messed up syncing.
Multiple additions

- Removed CRC Checking
- Added MIDI Packing
- Added MIDI Packing mode
- Added randomly selected music to title screen
- Added a utility to read .cfg files
- Added Config.java to client, making configuration slightly easier
- Packed 7 new MIDI files into the Cache
- Added a line to Compile.bat to compile the utilities
- Fixed some errors in Commands.java
- Added the playsong command
Merge pull request #31 from Figglewatts/master

Many additions
Update .gitignore
Update .gitignore
Added missing files

Git does not forgive. Git does not forget.
Update .gitignore
Updated .gitignore
Fixed .gitignore
Merge branch 'master' of https://github.com/Figglewatts/yoloscape
Deleted unmergable files
 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