Added code to combine chord and measure samples. Time to watch
everything break
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes
Hope this doesn't break!

Conflicts:
	bin/classes/Player/SampleGenerator.class