made other changes
fixed smth
Merged test.rb
one more merge
one more merge from this branch
changed test.rb again