nascosta cartella nbproject
 risolto conflitto nbproject
Merge branch 'master' of github.com:sensorario/cancellami
Merge branch 'master' of github.com:sensorario/cancellami