Merge branch 'Major-Refactored' into Back-up

Conflicts:

src/com/randkprogramming/tapemeasurecalculator/calculator/MainCalculator
Screen.java