Repair by me
Completed Calculator
Merge branch 'feature/Factory' of https://github.com/meleni/MathSolver into feature/Factory

Conflicts:
	src/Calculator.java