branch2 modi2
Merge branch 'slave'

Conflicts:
	Testy/src/passByValue/Main.java