modified gitfile5
Merge branch 'master' of https://github.com/TransitChek/LearnGit

Conflicts:
	gitfile3.txt