Cleaning up spaghetti. Renaming methods to be easier to read
Cleaned up some more stuff
Refactoring sample generator
Merge branch 'master' of http://github.com/CSE120PowerRangers/MusicNotes
Refactored SampleGenerator
Merge branch 'master' of http://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/Player/SampleGenerator.class
	bin/resources.ap_
	src/Player/SampleGenerator.java