Release y changes
Merge branch 'master' of https://github.com/shahvic/Calculator into
Release-y

Conflicts:
	src/com/calc/CalculatorDemo.java