b change first and second lines too
Merge branch 'master' of github.com:hxx/practice-for-git into this-is-b-br

Conflicts:
	a.rb
Merge pull request #4 from hxx/this-is-b-br

This is b br