?
Merge branch 'develop' of https://github.com/kusunokisky/tusmath.git
into develop

Conflicts:
	tusmath/src/sjtools/CalcTool.java