reset branch1 to single statement
Merge branch 'branch1'

Conflicts:
	GitTestProject/bin/Santosh.class
	GitTestProject/src/Santosh.java