Initial Commit
Updated and added new file
change1
change in master1
change in master1
Merge branch 'master1'

Conflicts:
	GitTest/src/com/smadnani/test/git/first/GitTest.java
Merge branch 'master1'

Conflicts:
	GitTest/src/com/smadnani/test/git/first/GitTest.java
test7
test