Added/Completed Calculator.java