Update Demo1.java
Merge branch 'testing'

solve the conflict in Demo1.java