Nuovo progetto
asa
xs
xa
bugfix
xs
dsa
Merge branch 'master' into Branch_2_NuovoProgetto

Conflicts:
	newProject/nuovoFile.txt
xasa
Merge branch 'master' into Branch_1_NuovoProgetto

Conflicts:
	newProject/nuovoFile.txt
xs
Merge branch 'master' into Branch_2_NuovoProgetto

Conflicts:
	newProject/nuovoFile.txt
BUGFIX IMPORTANTE
Merge branch 'master' into Branch_2_NuovoProgetto

Conflicts:
	newProject/nuovoFile.txt
Merge branch 'master' into Branch_1_NuovoProgetto

Conflicts:
	newProject/nuovoFile.txt
nuovo file
Merge branch 'Branch_1_NuovoProgetto'
Merge branch 'Branch_2_NuovoProgetto'

Conflicts:
	newProject/nuovoFile.txt