merge foo.rb
Merge branch 'master' of https://github.com/adraeth/test_dir