Ajout de Test1
Ajout de Tes1 2
Merge branch 'master' of github.com:Ant-keke/Tp_Heritage

Conflicts:
	ChargerCommand.cpp
	ChargerCommand.h
	Controller.cpp