Add another test2.txt
Merge branch 'master' of github.com:ntechlab/test

Conflicts:
	SampleJava/doc/test2.txt