local add line 4
Merge branch 'gh-pages' of https://github.com/lumixraku/repo into gh-pages

Conflicts:
	ATestFile.txt

i delete the conflict signal