first commit MyClassGit
CangeMyclassGit
Merge branch 'master' of https://github.com/giuseppelisella/test.git

Conflicts:
	MyClassGit.txt
Merge branch 'master' of https://github.com/giuseppelisella/test