^^^
ddd
Merge branch 'master' of https://github.com/NashLegend/Shuffle.git

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