added hello1
added hello2
added hello3
added hello5
added newbranch.java
Merge branch '2'
Merge branch '3'
Merge branch '4'
Merge branch '5'
Merge branch 'newbranch'