Adding first editing file in this branch
deleted:    hello-world.rb
edited line 3
Merge branch 'testing'