Merge branch 'Antonello' into walter
aggiunto walter
Merge branch 'Antonello' into walter

Conflicts:
	index.html
fatte modifiche 2
Merge remote-tracking branch 'origin/walter' into Antonello