Testing pull conflicts
Merge branch 'master' of https://github.com/rashmik/testgit.git

Conflicts:
	test-git/src/com/test/git/java/Test.java