Working on Calculator
Merge branch 'master' of https://github.com/Danmar-IVS/MVC-Java-Swing

Conflicts:
	out/production/MVC-Java-Swing/com/danmar/calc/Main.class

out/production/MVC-Java-Swing/com/danmar/calc/controller/MainController$
1.class

out/production/MVC-Java-Swing/com/danmar/calc/controller/MainController.
class
	out/production/MVC-Java-Swing/com/danmar/calc/view/CalculatorView.class

out/production/MVC-Java-Swing/com/danmar/mvc/controller/Controller.class