b change 1 3 line too
Merge branch 'master' of github.com:hxx/practice-for-git into b

Conflicts:
	a.rb
Merge pull request #6 from hxx/b

B