test22
Merge branch 'master' of https://github.com/bestehle/test.git

Conflicts:
	test_git/src/test/Test.java