This is my test!
A Test Again!
Merge branch 'master' of https://github.com/oldmanpushcart/GitTest

Conflicts:
	my.txt