commit by skl
Merge branch 'master' of https://github.com/bagamoon/GitTest

Conflicts:
	File001.txt