Testing for conflicts (WIN Juno)
Merge branch 'master' of ssh://git@github.com/vadozy/HelloWorld.git

Conflicts:
	src/com/test/App2.java