Avancement
Avancement 2
Merge branch 'JM'

Conflicts:
	CShpere.cpp
	ccube.cpp
	cglarea.cpp
	cpalet.cpp
	rectangle.cpp
	rectangle.h