Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/resources/CalculatorResource.java

src/main/java/resources/CalculatorResource.java

 package resources;
 
-<<<<<<< HEAD
-import org.graalvm.compiler.hotspot.stubs.DivisionByZeroExceptionStub;
-=======
->>>>>>> 2ffc5ca1cddf44a1e6d380f18eb4b10bb4578efb
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -16,7 +11,6 @@ import javax.ws.rs.core.MediaType;
  */
 @Path("/calculator")
 public class CalculatorResource {
-
 /**
  * Method handling HTTP POST requests. The calculated answer to the expression will be sent to the client as
  * plain/text.
@@ -51,7 +45,7 @@ public int calculate(String expression) {
 
     return result;
 }
-
+//Multiplication
     public int multiplication(String equation) {
     String[] split = equation.split("[*]");
     int sum = Integer.parseInt(split[0]);