add a.rb
yellowstar commit
add *.orig into .gitignore
Merge branch 'master' of github.com:hxx/practice-for-git into git-merge-with-opendiff

Conflicts:
	a.rb
Merge pull request #2 from hxx/git-merge-with-opendiff

Git merge with opendiff