ajout Mock / Fake
Last modification
Makefile modification
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
	test/BatteryTest.h