2
master only
bug only
test fight
test fight
Merge branch 'bug'

Conflicts:
	step2.txt
Merge branch 'master' of https://github.com/SungYY/git-p3