explain Commit
Merge branch 'master' of https://github.com/kimit/public

Conflicts:
	gitTest.txt