add a.rb
Merge pull request #1 from hxx/git-conflict-with-opendiff

add a.rb