eclipse
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_git/src/test/Test.java