save
Merge branch 'master' of github.com:bmarci/vpDroid

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