#5 Shape drawing implementation

[Giovanni Botta]

Improving the current drawing functions to include rectangles, circles and other shapes.