rd
fixing this branch issue
Merge branch 'CombinedA6' of https://github.com/Software-Dev-Team-AWOK/SignalMatcher into CombinedA6

Conflicts:
	bin/main/CanonicalFile.class
	bin/main/FileWrapper.class
	bin/main/Fingerprint.class
	src/main/CanonicalFile.java