Things were broken cause the project buildpath required some libraries from Andrew's end
Merge branch 'master' of http://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/dexedLibs/android-support-v4-186335c744ae6f4caf51541a0bb20852.jar
	bin/resources.ap_