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

Conflicts:
	classA.java
Merge branch 'master' of https://github.com/iziz/newcalGit