Line Shortening
Merge branch 'master' of https://github.com/Software-Dev-Team-AWOK/SignalMatcher

Conflicts:
	src/main/FingerPrint.java
	src/main/Fragment.java