Now time to see if I can break things
Still a null pointers from playback - I tried.
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes
bug stuff

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/resources.ap_