Finish merge.
another merge.

Conflicts:
	SPL/Assignment2/src/Junction.cpp
	SPL/Assignment2/src/Road.cpp
	SPL/Assignment2/src/Simulator.cpp