Updated ShapeBuilder

-Added diamond shape
-Exit message no longer displays with invalid shape choices