it's a readme

readme
testWithHello

a test with hello
Merge branch 'master' of https://github.com/plzhang2013/plzhang

Conflicts:
	README.md