java 2nd update
Merge branch 'master' of https://github.com/kathuriasumit/SampleProject

Conflicts:
	src/sk/sample/SampleClient.java