java project now
Merge branch 'master' of https://github.com/tharinduf/test-ysl.git

Conflicts:
	src/HelloWorld.java