Test 6 commit.
Merge branch 'FirstBranch' of
https://github.com/amitwadnerkar/TestingGIT.git into FirstBranch

Conflicts:
	NewTestGit/src/com/bcsg/Test.java