Issue found: media player cannot be created on tablets
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.class
	bin/dexedLibs/android-midi-libv3-49-9c717da90fda626bd078e62244399917.jar
	bin/dexedLibs/android-support-v4-0a8b51f8b3c1feff2c048e1d19d8e8cb.jar
	bin/resources.ap_
	res/layout/editor_layout.xml
Fixed disappearing background lines