adding comments
Merge branch 'master' of https://github.com/cle-git/calc

Conflicts:
	Calc.java