1
Merge branch 'master' of http://github.com/Bticino-Varese/corsogit
Merge branch 'master' of http://github.com/Bticino-Varese/corsogit
Merge branch 'master' of http://github.com/Bticino-Varese/corsogit

Conflicts:
	test.txt