t8
Merge branch 'testing'

Conflicts:
	Test/src/pl/Test.java