Fixed problems in SHapesDemo
First draft of ShapeHistory class
ShapesDemo improved with definitions and ShapeHistory
Merge branch 'tests/shapesdemo' into develop