Refactoring.
Merge branch 'master' of https://github.com/medrimonia/ProjetSE

Conflicts solved:
	include/driver.h