Merging
Merge branch 'master' of http://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/classes/Player/SampleGenerator.class
Found some errors
Merge branch 'master' of http://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	src/Player/SampleGenerator.java
Merging changes to samplegenerator