merge
Merge branch 'master' of https://github.com/srinath4ever/JavaTest.git

Conflicts:
	JavaTest/bin/.gitignore