Trying to fix measure division issues
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/com/example/musicnotes/EditorActivity$11.class
	bin/classes/com/example/musicnotes/NoteToScreen.class
	bin/resources.ap_
Broke everything. Made changes to Signature, Staff, and Measure to figure out num divisions
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$10.class
	bin/classes/com/example/musicnotes/EditorActivity$11.class
	bin/classes/com/example/musicnotes/EditorActivity$12.class
	bin/classes/com/example/musicnotes/EditorActivity$2.class
	bin/classes/com/example/musicnotes/EditorActivity$3.class
	bin/classes/com/example/musicnotes/EditorActivity$4.class
	bin/classes/com/example/musicnotes/EditorActivity$5.class
	bin/classes/com/example/musicnotes/EditorActivity$6.class
	bin/classes/com/example/musicnotes/EditorActivity$7.class
	bin/classes/com/example/musicnotes/EditorActivity$8.class
	bin/classes/com/example/musicnotes/EditorActivity$9.class
	bin/classes/com/example/musicnotes/EditorActivity.class
	bin/classes/com/example/musicnotes/NoteToScreen.class
	bin/resources.ap_