Added some functionality to Shape class-- comment at top indicates which functions still need to be implemented