Aggiunta riga carlomagno
Merge branch 'Antonello' into walter

Conflicts:
	index.html