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

Conflicts:
	moduli/generatoreClienti.c
enrico modifica