commit
Merge branch 'master' of https://github.com/erthh/Calculator.git

Conflicts:
	GitTest/src/Calculator.java
Merge remote-tracking branch 'origin/GUI'

Conflicts:
	GitTest/src/Calculator.java