created test.rb~
hotfix branch, changed test.rb
added write.rb
Merge branch 'testing'