no changes
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/resources.ap_
removed a lot of the null pointer errors. still have out of bounds
errors.