modifica di esercizio1
Merge branch 'master' of https://github.com/paolosimioni/prova_git

Conflicts:
	esercizio1
Merge branch 'master' of https://github.com/paolosimioni/prova_git