"add hello.java file "
add cat.java file
update cat.java file
update hello.java
Merge branch 'cat'