created two new java files after first merge
Merge branch 'master' of ssh://git@github.com/a6955567/testproj