some shit
Merge branch 'master' of https://github.com/ltb11/SightReading

Conflicts:
	src/musicdetection/MusicDetector.java