t1
t2
t7
Merge branch 'testing'

Conflicts:
	Test/src/pl/Test.java