ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	Chandim-Project/VehicleQueue.h
	Chandim-Project/main.cpp