edit line1
edit line2.rb
create and edit line3.rb
create line4.rb
create line1.rb and delete line1
Merge branch 'line1'
Merge branch 'line2'
Merge branch 'line3'
Merge branch 'line4'