Further tweaking the classes, removed sound to try and make it work right
Tried to fix more of the code
Merge branch 'master' of https://github.com/Nayshlok/NXTSoftware
Trying to fix merge conflict, with import headings
Conflicts:
	lejosSoftware/NXTDavidImpl/src/model/detectors/DistanceDetector.java