Update de CandyBody

A ce stade, la version sur github est plus à jour
Merge branch 'master' of https://github.com/fbessou/Projet2MIC

Conflicts:
	include/CandyBody.h
	src/CandyBody.cpp