Merge branches 'feature_division_polished' and 'feature_subtraction_polished'

Conflicts:	src/Main.groovy	Solved by bringing in both features (both imports, both calls)

Author: matthewmccullough

src/Main.groovy

@@ -1,5 +1,6 @@
 import static Square.square
 import static Division.divide
+import static Subtract.subtract
 import static Sum.sum
 
 def name = "Matthew"
@@ -9,4 +10,5 @@ println "Hello ${name}"
 println "${name} has at least ${programmingPoints} programming points."
 println "${programmingPoints} squared is ${square(programmingPoints)}"
 println "${programmingPoints} divided by 2 bonus points is ${divide(programmingPoints, 2)}"
+println "${programmingPoints} minus 7 bonus points is ${subtract(programmingPoints, 7)}"
 println "${programmingPoints} plus 3 bonus points is ${sum(programmingPoints, 3)}"

src/Subtract.groovy

@@ -0,0 +1,3 @@
+static int subtract(int val1, val2) {
+ val1 - val2
+}