Updates
Merge branch 'master' of https://github.com/actoris/Java-Calc

Conflicts:
	README.md