OK
Merge branch 'master' of https://github.com/Biouche/ProjetC.git

Conflicts:
	ProjetC/Release/ProjetC
	ProjetC/Release/src/Main.o
	ProjetC/Tables/TEST.dbf
	ProjetC/src/FileManip.c