added Hello.java
Merge branches 'branch2' and 'branch1' into branch2