Partie thib
Merge remote-tracking branch 'origin/Thib'

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