Merge branch 'master' into MikeBranch
Remove main,c
Remove header et makefile du gitignore
Merge branch 'MikeBranch'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/AntonyCanut/TMC-DEVC-003

Conflicts:
	.gitignore