Merge branch 'swing' of https://github.com/split-n/Calc into swing

Conflicts:
	src/GraphicalCalc.java