merging...
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/dexedLibs/android-midi-libv3-49-e819796e446f3e003ff4a14e9a5ad35f.jar
	bin/dexedLibs/android-support-v4-b0a75b716694f8aa0b2e66f0cc694b3e.jar
	bin/resources.ap_
bin crap
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes/com/example/musicnotes/EditorActivity.class
	bin/resources.ap_
hopefully fixed nullpointererrors with midiplayer.