prova
Merge branch 'master' of https://github.com/mariosuper/progettoSO

Conflicts:
	steGay.txt
enrico modifica