Midi conversion not perfect, another error stopping debugging
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes
binary conflicts. No big?
Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/com/example/musicnotes/EditorActivity.class
	bin/resources.ap_