Changes
Merge branch 'master' of https://github.com/shahvic/Calculator

Conflicts:
	src/com/calc/CalculatorDemo.java
	src/com/calc/Functions.java