Fixed up everything, compiles now. Output is unformatted and only add and subtract work for now.
Merge branch 'master' of https://github.com/Flick1/Calculator

Conflicts:
	Geometry.h
Merge branch 'master' of https://github.com/Flick1/Calculator

Conflicts:
	Calculator.depend
	Geometry.h
	Handler.h