merged test
Merge remote-tracking branch 'origin/master'

Conflicts:
	prototype/src/pkg/Test.java