no message
Merge branch 'Newcal' of https://github.com/iziz/newcalGit into Newcal

Conflicts:
	classB.java