New commit by RayzerCoder
Merge origin/master

Conflicts:
	src/covoiturage/Covoiturage.java