Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/shape/Rectangle.java

src/main/java/shape/Circle.java

@@ -6,7 +6,6 @@ import javafx.scene.paint.Color;
 public class Circle implements Shape {
 
     private double radius, x, y;
-    public Color fillColor;
     private boolean isFinished;
 
     public Circle(double x, double y, double radius) {