Update Test.java
Update Test.java
Create Test1.java

New file created in Branch1
Merge remote-tracking branch 'origin/FirstBranch' into SecondBranch

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