gearly.jar update
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Compilation 2/bin/pars/Calc.class