music from Raakesh
it is nothing
Merge branch 'master' of https://github.com/qli26/Framusic

Conflicts:
	FramusicV2/bin/FramusicV2.apk
	FramusicV2/bin/classes.dex

	FramusicV2/bin/classes/com/team8/framusicv2/ChoosePicFoldersActivity$1.class

	FramusicV2/bin/classes/com/team8/framusicv2/ChoosePicFoldersActivity.class

	FramusicV2/bin/classes/com/team8/framusicv2/DisplayBackgroundMusicActivity$1.class

	FramusicV2/bin/classes/com/team8/framusicv2/DisplayBackgroundMusicActivity$6.class

	FramusicV2/bin/classes/com/team8/framusicv2/DisplayBackgroundMusicActivity.class
	FramusicV2/bin/resources.ap_