commit mem-partagee
Merge branch 'master' of https://github.com/dimsum12/Parking.git

Conflicts:
	Entree.cpp
Merge branch 'master' of https://github.com/dimsum12/Parking.git

Conflicts:
	bin/Parking
	main.cpp
	main.o