add hello world.rb
update server.rb
resolve conflicts