seems ready!
Merge branch 'master' of https://github.com/y0n1/CalCalc

Conflicts:
	nbproject/private/private.xml