änderung 4
Merge branch 'master' of https://github.com/blackravendb/test2.git

Conflicts:
	test3/src/main.java