modified:   banditore.c
	modified:   cliente.c
	modified:   struct.h
	modified:   utility.c
	modified:   utility.h
Merge branch 'master' of https://github.com/mariosuper/progettoSO

Conflicts:
	moduli/cliente.c

	modified:   moduli/cliente.c
Merge branch 'master' of https://github.com/mariosuper/progettoSO
	modified:   .DS_Store
	modified:   concatenaInteri.c
	modified:   moduli/.DS_Store
	modified:   moduli/Makefile
	deleted:    moduli/Makefile~
	deleted:    moduli/a.out
	deleted:    moduli/acquisti1.txt
	deleted:    moduli/acquisti2.txt
	deleted:    moduli/agente
	modified:   moduli/agente.c
	modified:   moduli/banditore.c
	deleted:    moduli/banditoreAndFiglio
	modified:   moduli/cliente.c
	deleted:    moduli/contaFile
	modified:   moduli/generatoreClienti.c
	deleted:    moduli/myApp
	modified:   moduli/struct.h
	modified:   moduli/utility.c
	modified:   moduli/utility.h
	deleted:    moduli/utility.h.gch