test update
Merge branch 'master' of https://github.com/iorgreths/JaxMan

Conflicts:
	src/Test.java