Add Circle class to Shapes
Brought master into this branch