Updated Shapes.java to include diamond and tri4