update 4.rb
Merge branch 'new_1'