Removing ConcreteShape
Removing ShapeConfigurationTest
(windows)
Fixed merge conflict on RotationShapesDemo.java