test
Merge branch 'master' of https://github.com/java-tester-x/JavaExercises2

Conflicts:
	JavaSamples.java