-test
Merge branch 'master' of
https://github.com/RtsFred/Final-Calibur-Source.git

Conflicts:
	Final Calibur Server/src/com/ew/Settings.java