General syntactic updates and some changes to class structure

 Changes to be committed:
	modified:   Calculator.pro.user
	modified:   api/josh/circleEquation.cpp
	modified:   api/josh/circleEquation.h
	modified:   api/tim/constants.cpp
	modified:   api/tim/input.cpp
	modified:   api/tim/input.h
	modified:   api/tim/number.h
	new file:   calculatorwindowOld.ui
	modified:   main.cpp
Merge branch 'master' of https://github.com/timlyo/Calculator

Conflicts:
	Calculator.pro.user

 Changes to be committed:
	deleted:    Calculator.pro.user
	modified:   README.md