Début Guide de style INSA
Suite guide de style youhou
Merge branch 'master' of https://github.com/dimsum12/Parking.git

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