prova
dopo overwrite
prova commit
Merge branch 'master' of https://github.com/piercosta/android.git

Conflicts:
	AntiTheft/src/it/unibo/antitheft/MainActivity.java