merge italia.code.org home page
fix merge conflic with italia.code.org