testing
Merge branch 'master' of https://github.com/integerbasic/toolbox

Conflicts:
	cardmake/Card.java