Midi to sheet still not working quite as expected...
bin nonsense merge
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/AndroidManifest.xml
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/com/example/musicnotes/EditorActivity.class
	bin/resources.ap_