made a change under testing
made a change under master
add merged test.rb