wo zai master zhe ge fen zhi shang xiu gai l wen jian.
master modify.
xiu gai.
wo zai bug branch xiu gai Bug.
he bing bug fen zhi de bug.
wan cheng gong zuo
Merge branch 'dev'
Merge branch 'dev' of github.com:hejuncheng/myGitHubRepository into dev

Conflicts:
	README.md

	modified:   README.md