test branch commit
Merge branch 'master' of git@github.com:riotopsys/GitDemo.git into demo
Update Main.java
Merge remote-tracking branch 'origin/demo' into demo