2 added.
test_branch
master
Merge branch 'test_branch'

Conflicts:
	GitTestFromEclipse/bin/sample/Sample.class
	GitTestFromEclipse/src/sample/Sample.java