a new.rb file
new2.rb file added
Merge branch 'branch2' into branch1