Update Circle.java
Update Square.java