Ciao GitHub2
Merge branch 'master' into walter

Conflicts:
	index.html
fix fatto e merge
Merge branch 'walter'
Merge branch 'master' of https://github.com/enuvolaw/helloGithub2