New third commit.
Merge branch 'master' of https://github.com/vitopapa/My-project

Conflicts:
	hi.txt.TXT