Commit giacomo3
Merge branch 'master' of https://github.com/gentiliniluca/Indovina_Zoo

Conflicts:
	file2.txt