edit Test.txt by jane
Merge branch 'master' of https://github.com/poorprogrammer/git-test

Conflicts:
	Test.txt