tests for adts
Merge branch 'master' of github.com:Bandits789/WhatSongIsItAnyway
merge merge
Conflicts:
	src/com/android/whatsongisitanyway/MusicTest.java