Seva added code to hello.rb
resolved conflict