CSP1150 A1: drawing rectangles over shape no longer makes current image disappear, overriding paint() instead of paintComponent() to draw rectangles
CSP1150 A1: fixed comments and javadocs, removed unnecessary methods.
Merge branch 'rewrite'