az
Controller
cere
Merge branch 'master' of github.com:Ant-keke/Tp_Heritage

Conflicts:
	ChargerCommand.h
	Controller.cpp
Programme enfin terminé
Merge branch 'master' of github.com:Ant-keke/Tp_Heritage

Conflicts:
	Controller.cpp
Ajout du dossier de Tests et réalisation d'une 15aines de tests
Merge branch 'master' of github.com:Ant-keke/Tp_Heritage

Conflicts:
	Controller.h
Merge branch 'master' of github.com:Ant-keke/Tp_Heritage