sortieVoiture et entreeVoiture
dMerge branch 'master' of https://github.com/Ant-keke/tp-multitache

Conflicts:
	Mere.cpp
commit
Merge branch 'master' of https://github.com/Ant-keke/tp-multitache

Conflicts:
	Mere.cpp
probleme à l'execution mais compile