Add Cat.rb
add Cat2.rb
add mas_dog.rb to master
add common.txt on master
Merge branch 'cat'
add file mm.txt
add file cc.txt
xxx
modify cat.rb
Merge branch 'cat'

Conflicts:
	cat.rb