prova conflitto
Merge branch 'master' of https://github.com/Apex-net/try_git

Conflicts:
	Foobar.txt