add new method again
Merge remote-tracking branch 'origin/myTest1' into test1

Conflicts:
	test/Jam.java