CDrawingArea
Merge branch 'master' of git@github.com:APicogna/Projet_GeomPaint.git

Conflicts:
	Projet_GeomPaint/src/Circle.java
	Projet_GeomPaint/src/Rectangle.java
CDrawingArea