add print
change print
Merge branch 'master' into peter

Conflicts:
	src/Test.java