Updating rep
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes
fixing my repo
Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/com/example/musicnotes/EditorActivity.class
	bin/resources.ap_
Fixed the measure layouts