shapes.h and shapes.cpp added