committing for sanity
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/resources.ap_
Fixed Editor Activity and Event Listeners, and some GUI
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/com/example/musicnotes/EditorActivity$1.class
	bin/classes/com/example/musicnotes/EditorActivity$2.class
	bin/classes/com/example/musicnotes/EditorActivity$EditorVal.class
	bin/classes/com/example/musicnotes/EditorActivity.class
	bin/res/crunch/drawable-hdpi/fillednotespace.png
	bin/res/crunch/drawable-mdpi/fillednotespace.png
	bin/res/crunch/drawable-xhdpi/fillednotespace.png
	bin/res/crunch/drawable-xxhdpi/fillednotespace.png
	bin/resources.ap_
	src/com/example/musicnotes/EditorActivity.java
Integrated Midi Player