create new file branch-a.html
modify REAME.md file
add line 2 to REAME.md file
modify line 2 of REAME.md
Merge branch 'branch_a'

Conflicts:
	REAME.md
Merge branch 'master' of github.com:PengMQ/GitWorkshop
add a blank REAME.md file