Cleanups?
Assignment 2 base
Merge branch 'master' of https://github.com/Moo64c/cs

Conflicts:
	SPL/Assignment2/include/Car.h
	SPL/Assignment2/include/Junction.h
	SPL/Assignment2/include/Road.h
	SPL/Assignment2/src/main.cpp