new branch used and add a cat.rb file rerun the merge again
to test
Merge branch 'master' of github.com:arthurp1114/hello-world