decimal point working
Merge branch 'master' of git@github.com:veriqual/Calculator.git

Conflicts:
	calc/src/com/example/calc/Calc.java