new file test.rb
new file test.rb master
merge master and testing