Figures task added
TODO: circle and square
*
Merge remote-tracking branch 'origin/master'