began work on midi->sheet
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/classes/File/FileMaker.class
	bin/classes/com/example/musicnotes/EditorActivity$1.class
	bin/classes/com/example/musicnotes/EditorActivity$2.class
	bin/classes/com/example/musicnotes/EditorActivity$3.class
	bin/classes/com/example/musicnotes/EditorActivity$EditorVal.class
	bin/classes/com/example/musicnotes/EditorActivity.class
a little progress on midi -> sheet
untested sheet -> midi done... testing soon
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/Player/MidiPlayer.class
	bin/classes/com/example/musicnotes/EditorActivity$1.class
	bin/classes/com/example/musicnotes/EditorActivity$2.class
	bin/classes/com/example/musicnotes/EditorActivity$3.class
	bin/classes/com/example/musicnotes/EditorActivity$EditorVal.class
	bin/classes/com/example/musicnotes/EditorActivity.class
	bin/resources.ap_
	src/com/example/musicnotes/EditorActivity.java